This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch HDDS-10994 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 38904c2f6c0a352f07f1bb1e15387d4e6a791fe4 Author: Doroszlai, Attila <[email protected]> AuthorDate: Sat Jun 8 14:52:11 2024 +0200 HDDS-10994. Migrate from Gradle Enterprise to Develocity --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/intermittent-test-check.yml | 2 +- .github/workflows/repeat-acceptance.yml | 2 +- .gitignore | 1 + .mvn/{gradle-enterprise.xml => develocity.xml} | 12 +++++++----- .mvn/extensions.xml | 6 +++--- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc07865f7f..7ffb9426a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: - name: Run a full build run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Store binaries for tests uses: actions/upload-artifact@v4 with: @@ -177,7 +177,7 @@ jobs: run: hadoop-ozone/dev-support/checks/build.sh -Dskip.npx -Dskip.installnpx -Djavac.version=${{ matrix.java }} env: OZONE_WITH_COVERAGE: false - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} basic: needs: - build-info @@ -216,7 +216,7 @@ jobs: run: hadoop-ozone/dev-support/checks/${{ matrix.check }}.sh continue-on-error: true env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Summary of failures run: hadoop-ozone/dev-support/checks/_summary.sh target/${{ matrix.check }}/summary.txt if: ${{ !cancelled() }} @@ -255,7 +255,7 @@ jobs: run: hadoop-ozone/dev-support/checks/${{ github.job }}.sh continue-on-error: true env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Summary of failures run: hadoop-ozone/dev-support/checks/_summary.sh target/${{ github.job }}/summary.txt if: ${{ !cancelled() }} @@ -466,7 +466,7 @@ jobs: hadoop-ozone/dev-support/checks/integration.sh -P${{ matrix.profile }} ${args} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Summary of failures run: hadoop-ozone/dev-support/checks/_summary.sh target/${{ github.job }}/summary.txt if: ${{ !cancelled() }} @@ -519,7 +519,7 @@ jobs: env: SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Archive build results uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/intermittent-test-check.yml b/.github/workflows/intermittent-test-check.yml index 57eb1f2c01..4c5da2bf86 100644 --- a/.github/workflows/intermittent-test-check.yml +++ b/.github/workflows/intermittent-test-check.yml @@ -203,7 +203,7 @@ jobs: fi continue-on-error: true env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Summary of failures run: hadoop-ozone/dev-support/checks/_summary.sh target/unit/summary.txt if: ${{ !cancelled() }} diff --git a/.github/workflows/repeat-acceptance.yml b/.github/workflows/repeat-acceptance.yml index 74ef6b87c2..5c0edd3d71 100644 --- a/.github/workflows/repeat-acceptance.yml +++ b/.github/workflows/repeat-acceptance.yml @@ -110,7 +110,7 @@ jobs: - name: Run a full build run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} - name: Store binaries for tests uses: actions/upload-artifact@v4 with: diff --git a/.gitignore b/.gitignore index 4cf4dd8628..ce7a473130 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ dev-support/ci/bats-assert dev-support/ci/bats-support .mvn/.gradle-enterprise/ +.mvn/.develocity/ diff --git a/.mvn/gradle-enterprise.xml b/.mvn/develocity.xml similarity index 83% rename from .mvn/gradle-enterprise.xml rename to .mvn/develocity.xml index 2667402c23..a506d13c0b 100644 --- a/.mvn/gradle-enterprise.xml +++ b/.mvn/develocity.xml @@ -19,9 +19,9 @@ under the License. --> -<gradleEnterprise - xmlns="https://www.gradle.com/gradle-enterprise-maven"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd";> +<develocity + xmlns="https://www.gradle.com/develocity-maven"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd";> <server> <url>https://ge.apache.org</url> <allowUntrusted>false</allowUntrusted> @@ -33,7 +33,9 @@ <testLogging>true</testLogging> </capture> <backgroundBuildScanUpload>#{isFalse(env['GITHUB_ACTIONS'])}</backgroundBuildScanUpload> - <publish>ALWAYS</publish> + <publishing> + <onlyIf>true</onlyIf> + </publishing> <publishIfAuthenticated>true</publishIfAuthenticated> <obfuscation> <ipAddresses>#{{'0.0.0.0'}}</ipAddresses> @@ -47,4 +49,4 @@ <enabled>false</enabled> </remote> </buildCache> -</gradleEnterprise> +</develocity> diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 15e487eec6..1363023c1e 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -23,12 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd";> <extension> <groupId>com.gradle</groupId> - <artifactId>gradle-enterprise-maven-extension</artifactId> - <version>1.20.1</version> + <artifactId>develocity-maven-extension</artifactId> + <version>1.21</version> </extension> <extension> <groupId>com.gradle</groupId> <artifactId>common-custom-user-data-maven-extension</artifactId> - <version>1.13</version> + <version>2.0</version> </extension> </extensions> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
