From 6a5136820f76fade27a480ebade4bb96c8d38190 Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Sun, 19 Jan 2025 21:20:20 -0600 Subject: [PATCH] GEODE-10457-Publish build scans to develocity.apache.org (#7891) --- .github/workflows/codeql.yml | 2 +- .github/workflows/gradle.yml | 20 ++++++++++---------- settings.gradle | 15 +++++++-------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 822354a09ad..fa98047104f 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -42,7 +42,7 @@ jobs: name: Analyze runs-on: ubuntu-latest env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} permissions: actions: read contents: read diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 622f157884d..bbcf016772c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -30,7 +30,7 @@ jobs: build: runs-on: ubuntu-latest env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK 8 @@ -53,7 +53,7 @@ jobs: java: ['11'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK (include all 3 JDKs in the env) @@ -96,7 +96,7 @@ jobs: java: ['8', '11', '17'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK (include all 3 JDKs in env) @@ -155,7 +155,7 @@ jobs: java: ['8'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -204,7 +204,7 @@ jobs: java: ['8'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -246,7 +246,7 @@ jobs: java: ['8'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -290,7 +290,7 @@ jobs: java: ['8'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -334,7 +334,7 @@ jobs: java: ['8'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -378,7 +378,7 @@ jobs: java: ['8'] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK @@ -424,7 +424,7 @@ jobs: java: [ '8' ] runs-on: ${{ matrix.os }} env: - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} steps: - uses: actions/checkout@v3 - name: Set up JDK diff --git a/settings.gradle b/settings.gradle index 09f362b5db7..ef9ec306010 100644 --- a/settings.gradle +++ b/settings.gradle @@ -39,21 +39,20 @@ pluginManagement { } plugins { - id 'com.gradle.enterprise' version '3.13.2' - id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10' + id 'com.gradle.develocity' version '3.18.2' + id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2' } def isGithubActions = System.getenv('GITHUB_ACTIONS') != null def isJenkins = System.getenv('JENKINS_URL') != null def isCI = isGithubActions || isJenkins -gradleEnterprise { - server = "https://ge.apache.org" +develocity { + server = "https://develocity.apache.org" + projectId = "geode" buildScan { - capture { taskInputFiles = true } uploadInBackground = !isCI - publishAlways() - publishIfAuthenticated() + publishing.onlyIf { it.isAuthenticated() } obfuscation { // This obfuscates the IP addresses of the build machine in the build scan. // Alternatively, the build scan will provide the hostname for troubleshooting host-specific issues. @@ -146,7 +145,7 @@ buildCache { enabled = !isCI } - remote(gradleEnterprise.buildCache) { + remote(develocity.buildCache) { enabled = false } }