From cd54673221db134604bae922f4c961a9f1b4b87f Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Wed, 10 Apr 2024 05:45:58 -0600
Subject: [PATCH] Use runner-os consistently in integ-tests

---
 .github/workflows/integ-test-caching-config.yml   |  2 +-
 .github/workflows/integ-test-dependency-graph.yml |  6 +++++-
 .../integ-test-dependency-submission.yml          | 15 ++++++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/integ-test-caching-config.yml b/.github/workflows/integ-test-caching-config.yml
index cec3ef8..e1afc0c 100644
--- a/.github/workflows/integ-test-caching-config.yml
+++ b/.github/workflows/integ-test-caching-config.yml
@@ -100,7 +100,7 @@ jobs:
 
   # Test that build scans are captured when caching is disabled because Gradle User Home already exists
   cache-disabled-pre-existing-gradle-home:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # This test only runs on Ubuntu
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
diff --git a/.github/workflows/integ-test-dependency-graph.yml b/.github/workflows/integ-test-dependency-graph.yml
index 481f89a..5ed3c3f 100644
--- a/.github/workflows/integ-test-dependency-graph.yml
+++ b/.github/workflows/integ-test-dependency-graph.yml
@@ -116,7 +116,11 @@ jobs:
         fi
         
   config-cache:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
diff --git a/.github/workflows/integ-test-dependency-submission.yml b/.github/workflows/integ-test-dependency-submission.yml
index 68b8598..3d0835b 100644
--- a/.github/workflows/integ-test-dependency-submission.yml
+++ b/.github/workflows/integ-test-dependency-submission.yml
@@ -158,7 +158,11 @@ jobs:
         build-root-directory: .github/workflow-samples/groovy-dsl
 
   config-cache:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
@@ -196,13 +200,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
         gradle: [8.0.2, 7.6.4, 7.1.1, 6.9.4, 6.0.1, 5.6.4, 5.2.1]
         include:
           - gradle: 5.6.4
             build-root-suffix: -gradle-5
           - gradle: 5.2.1
             build-root-suffix: -gradle-5
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4
@@ -218,7 +223,11 @@ jobs:
         GITHUB_DEPENDENCY_GRAPH_REF: 'refs/tags/v0.0.1' # Use a different ref to avoid updating the real dependency graph for the repository
 
   after-setup-gradle:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ${{fromJSON(inputs.runner-os)}}
+    runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout sources
       uses: actions/checkout@v4