From f9a8c6994a80064a8ec4f23e9db50ae4f0f97cc8 Mon Sep 17 00:00:00 2001
From: Puneet Behl <behlp@unityfoundation.io>
Date: Thu, 4 Apr 2024 04:37:34 +0530
Subject: [PATCH 1/2] fix(build): update develocity configurations

---
 .github/workflows/gradle.yml  |  2 ++
 .github/workflows/release.yml |  2 ++
 settings.gradle               | 21 ++++++++++++++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 23ee31d3e7..2468a561e8 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -29,6 +29,8 @@ jobs:
           TARGET_GRAILS_VERSION: ${{ github.event.inputs.grails_version }}
           TARGET_BRANCH: ${{ steps.extract_branch.outputs.value }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: |
             build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f67eef0c3e..06f4b6091c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -63,6 +63,8 @@ jobs:
           TARGET_GRAILS_VERSION: ${{ github.event.inputs.grails_version }}
           TARGET_BRANCH: ${{ steps.extract_branch.outputs.value }}
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
+          GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
         with:
           arguments: |
             assemble
diff --git a/settings.gradle b/settings.gradle
index cdc8552145..2cfae19dc3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,22 +3,33 @@ plugins {
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
 }
 
+plugins {
+    id "com.gradle.enterprise" version "3.16.2"
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
+}
+
 gradleEnterprise {
     server = 'https://ge.grails.org'
     buildScan {
         publishAlwaysIf(System.getenv('CI') == 'true')
         publishIfAuthenticated()
-        uploadInBackground = System.getenv('CI') == null
+        uploadInBackground = System.getenv("CI") == null
         capture {
             taskInputFiles = true
         }
     }
+
 }
+
 buildCache {
     local { enabled = System.getenv('CI') != 'true' }
-    remote(gradleEnterprise.buildCache) {
-        def isAuthenticated = System.getenv('GRADLE_ENTERPRISE_ACCESS_KEY')
+    remote(HttpBuildCache) {
+        def isAuthenticated = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER') && System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')
         push = System.getenv('CI') == 'true' && isAuthenticated
         enabled = true
-    }
-}
+        url = 'https://ge.grails.org/cache/'
+        credentials {
+            username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')
+            password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')
+        }
+    }}
\ No newline at end of file

From cfbd095e512bfe4e03dbb86cd79c2322c24f84b7 Mon Sep 17 00:00:00 2001
From: Puneet Behl <behlp@unityfoundation.io>
Date: Thu, 4 Apr 2024 04:39:19 +0530
Subject: [PATCH 2/2] fix(build): remove duplicate plugins block

---
 settings.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 2cfae19dc3..4bd1798e1b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,11 +3,6 @@ plugins {
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
 }
 
-plugins {
-    id "com.gradle.enterprise" version "3.16.2"
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.13'
-}
-
 gradleEnterprise {
     server = 'https://ge.grails.org'
     buildScan {