From 667e034cd941079383978eed95f81ff982f7ec79 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Wed, 10 Apr 2024 05:45:10 -0600
Subject: [PATCH] Split out test that requires DV access key

---
 .github/workflows/ci-full-check.yml           |  6 +++
 .github/workflows/ci-quick-check.yml          |  6 +++
 .../integ-test-build-scan-publish.yml         | 53 +++++++++++++++++++
 .../integ-test-inject-develocity.yml          | 42 +--------------
 4 files changed, 67 insertions(+), 40 deletions(-)
 create mode 100644 .github/workflows/integ-test-build-scan-publish.yml

diff --git a/.github/workflows/ci-full-check.yml b/.github/workflows/ci-full-check.yml
index 915fb56..f97146b 100644
--- a/.github/workflows/ci-full-check.yml
+++ b/.github/workflows/ci-full-check.yml
@@ -30,6 +30,12 @@ jobs:
     with:
       cache-key-prefix: ${{github.run_number}}-
 
+  build-scan-publish:
+    needs: build-distribution
+    uses: ./.github/workflows/integ-test-build-scan-publish.yml
+    with:
+      cache-key-prefix: ${{github.run_number}}-
+
   cache-cleanup:
     needs: build-distribution
     uses: ./.github/workflows/integ-test-cache-cleanup.yml
diff --git a/.github/workflows/ci-quick-check.yml b/.github/workflows/ci-quick-check.yml
index a90dc80..bdafe89 100644
--- a/.github/workflows/ci-quick-check.yml
+++ b/.github/workflows/ci-quick-check.yml
@@ -37,6 +37,12 @@ jobs:
     with:
       runner-os: '["ubuntu-latest"]'
 
+  build-scan-publish:
+    needs: build-distribution
+    uses: ./.github/workflows/integ-test-build-scan-publish.yml
+    with:
+      runner-os: '["ubuntu-latest"]'
+
   cache-cleanup:
     needs: build-distribution
     uses: ./.github/workflows/integ-test-cache-cleanup.yml
diff --git a/.github/workflows/integ-test-build-scan-publish.yml b/.github/workflows/integ-test-build-scan-publish.yml
new file mode 100644
index 0000000..d0a554a
--- /dev/null
+++ b/.github/workflows/integ-test-build-scan-publish.yml
@@ -0,0 +1,53 @@
+name: Test develocity injection
+
+on:
+  workflow_call:
+    inputs:
+      cache-key-prefix:
+        type: string
+      runner-os:
+        type: string
+        default: '["ubuntu-latest", "windows-latest", "macos-latest"]'
+
+env:
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: build-scan-publish-${{ inputs.cache-key-prefix }}
+
+jobs:
+  build-scan-publish:
+    strategy:
+      fail-fast: false
+      matrix:
+        gradle: [current, 7.6.2, 6.9.4, 5.6.4]
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Setup Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 8
+    - name: Setup Gradle
+      id: setup-gradle
+      uses: ./setup-gradle
+      with:
+        cache-read-only: false # For testing, allow writing cache entries on non-default branches
+        gradle-version: ${{ matrix.gradle }}
+        build-scan-publish: true
+        build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
+        build-scan-terms-of-use-agree: "yes"
+    - name: Run Gradle build
+      id: gradle
+      working-directory: .github/workflow-samples/no-ge
+      run: gradle help
+    - name: Check Build Scan url
+      if: ${{ !steps.gradle.outputs.build-scan-url }}
+      uses: actions/github-script@v7
+      with:
+        script: |
+          core.setFailed('No Build Scan detected')   
+
diff --git a/.github/workflows/integ-test-inject-develocity.yml b/.github/workflows/integ-test-inject-develocity.yml
index 43eccad..de25b5f 100644
--- a/.github/workflows/integ-test-inject-develocity.yml
+++ b/.github/workflows/integ-test-inject-develocity.yml
@@ -13,7 +13,7 @@ on:
         required: true
 
 env:
-  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: provision-gradle-versions-${{ inputs.cache-key-prefix }}
+  GRADLE_BUILD_ACTION_CACHE_KEY_PREFIX: inject-develocity-${{ inputs.cache-key-prefix }}
 
 jobs:
   inject-develocity:
@@ -30,7 +30,7 @@ jobs:
         gradle: [current, 7.6.2, 6.9.4, 5.6.4]
         os: ${{fromJSON(inputs.runner-os)}}
         plugin-version: [3.16.2, 3.17]
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
@@ -58,41 +58,3 @@ jobs:
       with:
         script: |
           core.setFailed('No Build Scan detected')   
-
-  build-scan-publish:
-    strategy:
-      fail-fast: false
-      matrix:
-        gradle: [current, 7.6.2, 6.9.4, 5.6.4]
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Setup Java
-      uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 8
-    - name: Setup Gradle
-      id: setup-gradle
-      uses: ./setup-gradle
-      with:
-        cache-read-only: false # For testing, allow writing cache entries on non-default branches
-        gradle-version: ${{ matrix.gradle }}
-        build-scan-publish: true
-        build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
-        build-scan-terms-of-use-agree: "yes"
-    - name: Run Gradle build
-      id: gradle
-      working-directory: .github/workflow-samples/no-ge
-      run: gradle help
-    - name: Check Build Scan url
-      if: ${{ !steps.gradle.outputs.build-scan-url }}
-      uses: actions/github-script@v7
-      with:
-        script: |
-          core.setFailed('No Build Scan detected')   
-