Skip to content

Commit

Permalink
[CI] Remove download progress
Browse files Browse the repository at this point in the history
  • Loading branch information
Corneil du Plessis committed Oct 4, 2024
1 parent f32a135 commit 141905c
Show file tree
Hide file tree
Showing 26 changed files with 71 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
shell: bash
run: |
if [ "${{ inputs.version }}" == "" ]; then
./mvnw help:evaluate -Dexpression=project.version -s .settings.xml > /dev/null
./mvnw help:evaluate -Dexpression=project.version -s .settings.xml -B --no-transfer-progress > /dev/null
VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
echo "::notice::VERSION=$VERSION"
echo "VERSION=$VERSION" >> $GITHUB_ENV
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-snapshot-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ jobs:
run: |
./mvnw --help
./spring-cloud-dataflow-package/set-package-version.sh
./mvnw -s .settings.xml package -DskipTests -T 1C
jfrog rt mvn -s .settings.xml install -Pfull,docs -B
jfrog rt mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
./mvnw -s .settings.xml package -DskipTests -T 1C --no-transfer-progress
jfrog rt mvn -s .settings.xml install -Pfull,docs -B --no-transfer-progress
jfrog rt mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B --no-transfer-progress
jfrog rt build-publish
PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
Expand Down Expand Up @@ -135,9 +135,9 @@ jobs:
shell: bash
timeout-minutes: 75
run: |
./mvnw clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
./mvnw clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -B --no-transfer-progress
export ENABLE_${{ matrix.db }}=true
./mvnw test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
./mvnw test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }} -B --no-transfer-progress
- name: Test Report
uses: dorny/test-reporter@v1
if: ${{ success() || failure() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
shell: bash
run: |
./mvnw --version
./mvnw help:evaluate -s .settings.xml -Dexpression=project.version > /dev/null
./mvnw help:evaluate -s .settings.xml -Dexpression=project.version --no-transfer-progress > /dev/null
echo "VERSIONS=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
- name: Version from Input
if: ${{ inputs.version != null && inputs.version != '' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-it-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: 'Action: Run Db IT'
run: |
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am -B --no-transfer-progress
./mvnw \
-s .settings.xml \
-pl spring-cloud-dataflow-server \
-Dgroups=${{ matrix.group }} \
-Pfailsafe \
--batch-mode \
--batch-mode --no-transfer-progress \
verify
- name: Integration Test Report for ${{ matrix.group }}
id: test_report
Expand Down Expand Up @@ -94,12 +94,12 @@ jobs:
env:
ENABLE_DB2: 'true'
run: |
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -am
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -am -B --no-transfer-progress
./mvnw \
-s .settings.xml \
-pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server \
-Dgroups=DB2 \
--batch-mode \
--batch-mode --no-transfer-progress \
test
- name: Test Report for DB2
id: test_report
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-it-performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ jobs:

- name: Run Performance IT
run: |
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am -B --no-transfer-progress
./mvnw -s .settings.xml \
-pl spring-cloud-dataflow-server \
-Dgroups=performance \
-Pfailsafe \
--batch-mode \
--batch-mode --no-transfer-progress \
verify
- name: Test Report
uses: dorny/test-reporter@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-it-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
- name: Run Security IT
shell: bash
run: |
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am
./mvnw clean install -DskipTests -T 1C -s .settings.xml -pl spring-cloud-dataflow-server -am -B --no-transfer-progress
./mvnw -s .settings.xml \
-pl spring-cloud-dataflow-server \
-Dgroups=oauth \
-Pfailsafe \
--batch-mode \
--batch-mode --no-transfer-progress \
test
- name: Test Report
uses: dorny/test-reporter@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
shell: bash
timeout-minutes: 75
run: |
./mvnw -B -s .github/settings.xml -Pdocs clean install
./mvnw -B -s .github/settings.xml -Pdocs clean install --no-transfer-progress
scan:
runs-on: ubuntu-latest
steps:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ jobs:
shell: bash
timeout-minutes: 75
run: |
./mvnw help:evaluate -s .settings.xml -Dexpression=project.version
./mvnw help:evaluate -s .settings.xml -Dexpression=project.version -B --no-transfer-progress
spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
echo spring_cloud_dataflow_version="$spring_cloud_dataflow_version" >> $GITHUB_ENV
export spring_cloud_dataflow_version
./spring-cloud-dataflow-package/set-package-version.sh
./mvnw -s .settings.xml package -DskipTests -T 1C
jfrog rt mvn -s .settings.xml install -Pfull,docs -B
jfrog rt mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B
./mvnw -s .settings.xml package -DskipTests -T 1C --no-transfer-progress
jfrog rt mvn -s .settings.xml install -Pfull,docs -B --no-transfer-progress
jfrog rt mvn -s .settings.xml install -pl spring-cloud-dataflow-package -B --no-transfer-progress
jfrog rt build-publish
export JFROG_CLI_BUILD_NAME="${JFROG_CLI_BUILD_NAME/spring-cloud-dataflow/spring-cloud-skipper}"
PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
Expand Down Expand Up @@ -138,9 +138,9 @@ jobs:
shell: bash
timeout-minutes: 75
run: |
./mvnw clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server
./mvnw clean install -s .settings.xml -DskipTests -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -B --no-transfer-progress
export ENABLE_${{ matrix.db }}=true
./mvnw test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }}
./mvnw test -s .settings.xml -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server -Dgroups=${{ matrix.db }} -B --no-transfer-progress
- name: Test Report
uses: dorny/test-reporter@v1
if: ${{ success() || failure() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fix-deployment-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
distribution: 'liberica'

- name: Build with Maven
run: ./mvnw process-resources -P deploymentfiles
run: ./mvnw process-resources -P deploymentfiles -B --no-transfer-progress

- name: Check Deployment Files
uses: peter-evans/create-pull-request@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ jobs:
--notes-file "${{runner.temp}}/release_notes.md"
# retrieve spring-cloud-dataflow-package and upload to github release
export PACKAGE_VERSION=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}
./mvnw -s .settings.xml build-helper:parse-version versions:set -DskipResolution=true -DprocessAllModules=true -DgenerateBackupPoms=false -Dartifactory.publish.artifacts=false -DnewVersion=$PACKAGE_VERSION
./mvnw -s .settings.xml build-helper:parse-version versions:set -DskipResolution=true -DprocessAllModules=true -DgenerateBackupPoms=false -Dartifactory.publish.artifacts=false -DnewVersion=$PACKAGE_VERSION -B --no-transfer-progress
./spring-cloud-dataflow-package/set-package-version.sh
./mvnw -s .settings.xml package -pl spring-cloud-dataflow-package
./mvnw -s .settings.xml package -pl spring-cloud-dataflow-package -B --no-transfer-progress
PACKAGE_FILE="./spring-cloud-dataflow-package/target/spring-cloud-dataflow-oss-install-${PACKAGE_VERSION}.zip"
gh release upload v$PACKAGE_VERSION $PACKAGE_FILE --clobber
# zoo success
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/milestone-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
-DgenerateBackupPoms=false \
-Dartifactory.publish.artifacts=false \
-DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-'${BUILD_ZOO_HANDLER_milestone_version} \
-B
-B --no-transfer-progress
BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"
Expand All @@ -81,25 +81,25 @@ jobs:
-DgenerateBackupPoms=false \
-Dproperty=dataflow.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \
-B
-B --no-transfer-progress
mvn versions:set-property \
-gs .github/settings.xml \
-Pstagingmilestone \
-DgenerateBackupPoms=false \
-Dproperty=spring-cloud-deployer.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version} \
-B
-B --no-transfer-progress
mvn versions:set-property \
-gs .github/settings.xml \
-Pstagingmilestone \
-DgenerateBackupPoms=false \
-Dproperty=spring-cloud-dataflow-ui.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version} \
-B
-B --no-transfer-progress
jfrog rt build-clean
./spring-cloud-dataflow-package/set-package-version.sh
./mvnw -s .settings.xml package -DskipTests -T 1C
jfrog rt mvn -gs .github/settings.xml -Pstagingmilestone,full,deploymentfiles,docs -B install -DskipTests
./mvnw -s .settings.xml package -DskipTests -T 1C --no-transfer-progress
jfrog rt mvn -gs .github/settings.xml -Pstagingmilestone,full,deploymentfiles,docs -B install -DskipTests --no-transfer-progress
jfrog rt build-publish
PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingmilestone help:evaluate -Dexpression=project.version -q -DforceStdout)
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$PROJECT_VERSION >> $GITHUB_ENV
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/next-dev-version-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,29 @@ jobs:
-DgenerateBackupPoms=false \
-Dartifactory.publish.artifacts=false \
-DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}-SNAPSHOT' \
-B
-B --no-transfer-progress
BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"
mvn versions:set-property \
-DgenerateBackupPoms=false \
-Dproperty=dataflow.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \
-B
-B --no-transfer-progress
mvn versions:set-property \
-DgenerateBackupPoms=false \
-Dproperty=spring-cloud-deployer.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version} \
-B
-B --no-transfer-progress
mvn versions:set-property \
-DgenerateBackupPoms=false \
-Dproperty=spring-cloud-dataflow-ui.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version} \
-B
-B --no-transfer-progress
jfrog rt build-clean
./spring-cloud-dataflow-package/set-package-version.sh
./mvnw -s .settings.xml package -DskipTests -T 1C
jfrog rt mvn -s .settings.xml install -DskipTests -B -T 1C
./mvnw -s .settings.xml package -DskipTests -T 1C --no-transfer-progress
jfrog rt mvn -s .settings.xml install -DskipTests -B -T 1C --no-transfer-progress
jfrog rt build-publish
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildname=spring-cloud-dataflow-main-ndv >> $GITHUB_ENV
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_buildnumber=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ jobs:
-DgenerateBackupPoms=false \
-Dartifactory.publish.artifacts=false \
-DnewVersion=${{ inputs.version }} \
-B
-B --no-transfer-progress
mvn versions:set-property \
-gs .github/settings.xml \
-Pstagingrelease \
-DskipResolution=true \
-DgenerateBackupPoms=false \
-Dproperty=dataflow.version \
-DnewVersion=${{ inputs.version }} \
-B
-B --no-transfer-progress
mvn versions:set-property \
-gs .github/settings.xml \
-Pstagingrelease \
-DskipResolution=true \
-DgenerateBackupPoms=false \
-Dproperty=skipper.version \
-DnewVersion=${{ inputs.version }} \
-B
-B --no-transfer-progress
spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
echo "spring_cloud_dataflow_version=$spring_cloud_dataflow_version" >> $GITHUB_ENV
echo "::notice ::set dataflow.version=${spring_cloud_dataflow_version}"
Expand All @@ -86,11 +86,11 @@ jobs:
echo "::notice ::set-package-version"
./spring-cloud-dataflow-package/set-package-version.sh
echo "::notice ::install"
./mvnw -gs .github/settings.xml -am -pl :spring-cloud-skipper-server-core install -DskipTests -T 1C
./mvnw -gs .github/settings.xml -am -pl :spring-cloud-skipper-server-core install -DskipTests -T 1C -B --no-transfer-progress
jfrog rt mvn -gs .github/settings.xml \
-Pstagingrelease,full,deploymentfiles,docs \
-pl :spring-cloud-dataflow-classic-docs,:spring-cloud-dataflow-docs,:spring-cloud-skipper-docs \
-B install -DskipTests
-B install -DskipTests --no-transfer-progress
echo "::notice ::build-publish"
jfrog rt build-publish
echo "::info ::spring_cloud_dataflow_version=$spring_cloud_dataflow_version"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release-worker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
-DgenerateBackupPoms=false \
-Dartifactory.publish.artifacts=false \
-DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' \
-B
-B --no-transfer-progress
BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)
echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$BUILD_ZOO_HANDLER_spring_cloud_dataflow_version >> $GITHUB_ENV
echo "::notice ::set dataflow.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version}"
Expand All @@ -84,7 +84,7 @@ jobs:
-DgenerateBackupPoms=false \
-Dproperty=dataflow.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \
-B
-B --no-transfer-progress
echo "::notice ::set spring-cloud-deployer.version=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version}"
mvn versions:set-property \
-gs .github/settings.xml \
Expand All @@ -93,7 +93,7 @@ jobs:
-DgenerateBackupPoms=false \
-Dproperty=spring-cloud-deployer.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_deployer_version} \
-B
-B --no-transfer-progress
echo "::notice ::set spring-cloud-dataflow-ui.version=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version}"
mvn versions:set-property \
-gs .github/settings.xml \
Expand All @@ -102,14 +102,14 @@ jobs:
-DgenerateBackupPoms=false \
-Dproperty=spring-cloud-dataflow-ui.version \
-DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_ui_version} \
-B
-B --no-transfer-progress
echo "::notice ::build-clean"
jfrog rt build-clean
echo "::notice ::set-package-version"
./spring-cloud-dataflow-package/set-package-version.sh
echo "::notice ::install"
./mvnw -s .settings.xml package -Pstagingrelease -DskipTests -T 1C
jfrog rt mvn -gs .github/settings.xml -Pstagingrelease,full,deploymentfiles,docs -B install -DskipTests
./mvnw -s .settings.xml package -Pstagingrelease -DskipTests -T 1C --no-transfer-progress
jfrog rt mvn -gs .github/settings.xml -Pstagingrelease,full,deploymentfiles,docs -B install -DskipTests --no-transfer-progress
echo "::notice ::build-publish"
jfrog rt build-publish
PROJECT_VERSION=$(./mvnw -gs .github/settings.xml -Pstagingrelease help:evaluate -Dexpression=project.version -q -DforceStdout)
Expand Down
4 changes: 2 additions & 2 deletions build-containers.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
./mvnw install -s .settings.xml -DskipTests -T 1C -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server,:spring-cloud-dataflow-composed-task-runner,:spring-cloud-dataflow-tasklauncher-sink-rabbit,:spring-cloud-dataflow-tasklauncher-sink-kafka
./mvnw spring-boot:build-image -s .settings.xml -DskipTests -T 1C -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server,:spring-cloud-dataflow-composed-task-runner,:spring-cloud-dataflow-tasklauncher-sink-rabbit,:spring-cloud-dataflow-tasklauncher-sink-kafka
./mvnw install -s .settings.xml -DskipTests -T 1C -am -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server,:spring-cloud-dataflow-composed-task-runner,:spring-cloud-dataflow-tasklauncher-sink-rabbit,:spring-cloud-dataflow-tasklauncher-sink-kafka -B --no-transfer-progress
./mvnw spring-boot:build-image -s .settings.xml -DskipTests -T 1C -pl :spring-cloud-dataflow-server,:spring-cloud-skipper-server,:spring-cloud-dataflow-composed-task-runner,:spring-cloud-dataflow-tasklauncher-sink-rabbit,:spring-cloud-dataflow-tasklauncher-sink-kafka -B --no-transfer-progress
2 changes: 1 addition & 1 deletion run-integration-test.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
GROUP=$1
./mvnw verify -s .settings.xml -Dgroups="$GROUP" -Pfailsafe -pl :spring-cloud-dataflow-server
./mvnw verify -s .settings.xml -Dgroups="$GROUP" -Pfailsafe -pl :spring-cloud-dataflow-server -B --no-transfer-progress
Loading

0 comments on commit 141905c

Please sign in to comment.