From 7ef091c12714b40d5dd93ff1488b086f0cebf3f8 Mon Sep 17 00:00:00 2001 From: Clay Johnson Date: Tue, 21 Jan 2025 07:47:24 -0600 Subject: [PATCH] Publish build scans to develocity.apache.org (#5528) * Publish build scans to develocity.apache.org * Use `DEVELOCITY_ACCESS_KEY` to authenticate to `develocity.apache.org` * Update Develocity plugin versions --- .github/workflows/0-on-demand.yaml | 4 ++-- .github/workflows/1-unit.yaml | 4 ++-- .github/workflows/2-system.yaml | 4 ++-- .github/workflows/3-multi-runtime.yaml | 4 ++-- .github/workflows/4-standalone.yaml | 4 ++-- .github/workflows/5-scheduler.yaml | 4 ++-- .github/workflows/6-performance.yaml | 4 ++-- settings.gradle | 15 +++++++-------- 8 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/0-on-demand.yaml b/.github/workflows/0-on-demand.yaml index 9747a54cc27..2c0741a1232 100644 --- a/.github/workflows/0-on-demand.yaml +++ b/.github/workflows/0-on-demand.yaml @@ -56,8 +56,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} # (optional) you need to add as secrets an ngrok token and a password to debug a build on demand NGROK_DEBUG: ${{ inputs.enable_ngrok_debug }} diff --git a/.github/workflows/1-unit.yaml b/.github/workflows/1-unit.yaml index dd60ac90abf..525265422a5 100644 --- a/.github/workflows/1-unit.yaml +++ b/.github/workflows/1-unit.yaml @@ -51,8 +51,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: openwhisk: diff --git a/.github/workflows/2-system.yaml b/.github/workflows/2-system.yaml index 6ad5f85d9dc..a195f55295c 100644 --- a/.github/workflows/2-system.yaml +++ b/.github/workflows/2-system.yaml @@ -46,8 +46,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: openwhisk: diff --git a/.github/workflows/3-multi-runtime.yaml b/.github/workflows/3-multi-runtime.yaml index a7a7d830a7e..de5c70fe6f8 100644 --- a/.github/workflows/3-multi-runtime.yaml +++ b/.github/workflows/3-multi-runtime.yaml @@ -46,8 +46,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: openwhisk: diff --git a/.github/workflows/4-standalone.yaml b/.github/workflows/4-standalone.yaml index 5c2f59c2461..e5828dba3c0 100644 --- a/.github/workflows/4-standalone.yaml +++ b/.github/workflows/4-standalone.yaml @@ -46,8 +46,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: openwhisk: diff --git a/.github/workflows/5-scheduler.yaml b/.github/workflows/5-scheduler.yaml index 3f5b8710748..64f775626cd 100644 --- a/.github/workflows/5-scheduler.yaml +++ b/.github/workflows/5-scheduler.yaml @@ -46,8 +46,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: openwhisk: diff --git a/.github/workflows/6-performance.yaml b/.github/workflows/6-performance.yaml index 4435810b3cb..30f297b0cff 100644 --- a/.github/workflows/6-performance.yaml +++ b/.github/workflows/6-performance.yaml @@ -46,8 +46,8 @@ env: GH_BUILD: ${{ github.event_name }}-${{ github.sha }} GH_BRANCH: ${{ github.head_ref || github.ref_name }} - # https://ge.apache.org - GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }} + # https://develocity.apache.org + DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }} jobs: openwhisk: diff --git a/settings.gradle b/settings.gradle index d7e9f361299..b372c9b4e16 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,21 +16,20 @@ */ 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 = "openwhisk" 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. @@ -44,7 +43,7 @@ buildCache { enabled = !isCI } - remote(gradleEnterprise.buildCache) { + remote(develocity.buildCache) { enabled = false } }