fix(build): update develocity configurations (#895)

* fix(build): update develocity configurations * fix(build): remove duplicate plugins block
grails · Apr 3, 2024 · 1f4c27f · 1f4c27f
1 parent 5e0842f
commit 1f4c27f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git 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
@@ -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
@@ -8,17 +8,23 @@ gradleEnterprise {
     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')
+        }
+    }}