From 78c852a99195608ac4db28d4185ae13a376430a2 Mon Sep 17 00:00:00 2001
From: Mattias Reichel <mattias.reichel@gmail.com>
Date: Mon, 14 Apr 2025 15:33:57 +0200
Subject: [PATCH 1/2] build: fix develocity authentication

---
 settings.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index dd7574d84f0..cceab0fd137 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,14 +5,13 @@ plugins {
 
 def isCI = System.getenv().containsKey('CI')
 def isLocal = !isCI
-def isAuthenticated = System.getenv().containsKey('GRAILS_DEVELOCITY_ACCESS_KEY')
 
 develocity {
     server = 'https://ge.grails.org'
     buildScan {
         tag('grails')
         tag('grails-data-mapping')
-        publishing.onlyIf { isAuthenticated }
+        publishing.onlyIf { it.authenticated }
         uploadInBackground = isLocal
     }
 }
@@ -20,7 +19,7 @@ develocity {
 buildCache {
     local { enabled = isLocal }
     remote(develocity.buildCache) {
-        push = isCI && isAuthenticated
+        push = isCI
         enabled = true
     }
 }

From fcd27e7fa9a24e45fa5ab5f75afdccc27a8f3f88 Mon Sep 17 00:00:00 2001
From: Mattias Reichel <mattias.reichel@gmail.com>
Date: Mon, 14 Apr 2025 15:36:48 +0200
Subject: [PATCH 2/2] build: test adding the develocity key prefix

As the access key does not seem to work, this
is a test if the host prefix is missing.
---
 .github/workflows/gradle.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 3399b77606c..820dbb1e9fc 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -28,7 +28,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ge.grails.org=${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔨 Run Build"
         id: build
         env:
@@ -63,7 +63,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ge.grails.org=${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔨 Run Build"
         id: build
         env:
@@ -87,7 +87,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ge.grails.org=${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔨 Run Build"
         id: build
         env:
@@ -109,7 +109,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ge.grails.org=${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "📤 Publish Snapshot artifacts"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
@@ -135,7 +135,7 @@ jobs:
       - name: "🐘 Setup Gradle"
         uses: gradle/actions/setup-gradle@v4
         with:
-          develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ge.grails.org=${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
       - name: "🔨 Build Docs"
         env:
           GITHUB_MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}