From dbe05a57c5bf79b854a08cbac8451e81bdb79458 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Mon, 2 Feb 2026 14:18:21 -0700
Subject: [PATCH] Use recommended global install of DV npm agent

---
 .github/workflows/ci-check-and-unit-test.yml |  9 ++++---
 build                                        |  2 --
 sources/develocity.config.js                 |  8 ++++++
 sources/package-lock.json                    | 27 --------------------
 sources/package.json                         |  1 -
 5 files changed, 14 insertions(+), 33 deletions(-)
 create mode 100644 sources/develocity.config.js

diff --git a/.github/workflows/ci-check-and-unit-test.yml b/.github/workflows/ci-check-and-unit-test.yml
index d80e98ac..c33bf0f5 100644
--- a/.github/workflows/ci-check-and-unit-test.yml
+++ b/.github/workflows/ci-check-and-unit-test.yml
@@ -21,9 +21,14 @@ jobs:
       uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
       with:
-        node-version: 20
+        node-version: 24
         cache: npm
         cache-dependency-path: sources/package-lock.json
+
+    - name: Install Develocity npm agent
+      run: |
+        npm exec -y -- pacote extract @gradle-tech/develocity-agent@3.0.1 ~/.node_libraries/@gradle-tech/develocity-agent
+
     - name: Setup Gradle
       # Use a released version to avoid breakages
       uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
@@ -44,7 +49,6 @@ jobs:
       working-directory: sources
       env:
         NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
-        DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
 
     - name: Run unit tests
@@ -53,5 +57,4 @@ jobs:
       working-directory: sources
       env:
         NODE_OPTIONS: '-r @gradle-tech/develocity-agent/preload'
-        DEVELOCITY_URL: 'https://ge.solutions-team.gradle.com'
         DEVELOCITY_ACCESS_KEY: '${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}'
diff --git a/build b/build
index ae5d8377..01b460a1 100755
--- a/build
+++ b/build
@@ -4,8 +4,6 @@ cd sources
 
 if [[ -f ~/.gradle/develocity/keys.properties ]]; then
     export NODE_OPTIONS='-r @gradle-tech/develocity-agent/preload'
-    export DEVELOCITY_URL=https://ge.solutions-team.gradle.com
-    export DEVELOCITY_ACCESS_KEY=$(paste -sd ';' ~/.gradle/develocity/keys.properties)
 fi
 
 case "$1" in
diff --git a/sources/develocity.config.js b/sources/develocity.config.js
new file mode 100644
index 00000000..a0a59020
--- /dev/null
+++ b/sources/develocity.config.js
@@ -0,0 +1,8 @@
+const { fromPropertiesFile, inGradleUserHome } = require('@gradle-tech/develocity-agent/api/config');
+
+module.exports = {
+  server: {
+    url: 'https://ge.solutions-team.gradle.com/',
+    accessKey: fromPropertiesFile(inGradleUserHome()),
+  },
+}
diff --git a/sources/package-lock.json b/sources/package-lock.json
index b8ffaf46..4d0d936a 100644
--- a/sources/package-lock.json
+++ b/sources/package-lock.json
@@ -26,7 +26,6 @@
         "which": "6.0.0"
       },
       "devDependencies": {
-        "@gradle-tech/develocity-agent": "3.0.1",
         "@jest/globals": "30.2.0",
         "@types/jest": "30.0.0",
         "@types/node": "25.0.9",
@@ -1384,32 +1383,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@gradle-tech/develocity-agent": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@gradle-tech/develocity-agent/-/develocity-agent-3.0.1.tgz",
-      "integrity": "sha512-iYD41N7Wi49E+Qns4ra4D6TQNcIp2M5yH7z96DWlo4xRBkFXdSKKd7UpRkd+6xs0sPDatgNYTHX2c3gRosfbYQ==",
-      "dev": true,
-      "license": "SEE LICENSE AT https://gradle.com/help/legal-terms-of-use",
-      "engines": {
-        "node": ">=18.20.5"
-      },
-      "peerDependencies": {
-        "@jest/jest-message-util": ">=29.6",
-        "@jest/reporters": ">=29.6",
-        "mocha": ">=7.0.1"
-      },
-      "peerDependenciesMeta": {
-        "@jest/jest-message-util": {
-          "optional": true
-        },
-        "@jest/reporters": {
-          "optional": true
-        },
-        "mocha": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
diff --git a/sources/package.json b/sources/package.json
index 1571913d..d9e017d8 100644
--- a/sources/package.json
+++ b/sources/package.json
@@ -51,7 +51,6 @@
     "which": "6.0.0"
   },
   "devDependencies": {
-    "@gradle-tech/develocity-agent": "3.0.1",
     "@jest/globals": "30.2.0",
     "@types/jest": "30.0.0",
     "@types/node": "25.0.9",