From d71ecafebfb931c1e152761fc64427b6fb4edcaf Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Sat, 6 Apr 2024 16:00:53 -0600
Subject: [PATCH] Minor test reorg

---
 .../workflows/integ-test-dependency-graph.yml | 30 +++++++++----------
 CONTRIBUTING.md                               |  3 ++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/integ-test-dependency-graph.yml b/.github/workflows/integ-test-dependency-graph.yml
index 76ddd187..0821594e 100644
--- a/.github/workflows/integ-test-dependency-graph.yml
+++ b/.github/workflows/integ-test-dependency-graph.yml
@@ -39,7 +39,21 @@ jobs:
       run: ./gradlew build
       working-directory: .github/workflow-samples/groovy-dsl
 
-  kotlin-generate:
+  groovy-submit:
+    needs: [groovy-generate]
+    runs-on: "ubuntu-latest"
+    steps:
+    - name: Checkout sources
+      uses: actions/checkout@v4
+    - name: Initialize integ-test
+      uses: ./.github/actions/init-integ-test
+
+    - name: Submit dependency graphs
+      uses: ./setup-gradle
+      with:
+        dependency-graph: download-and-submit
+
+  kotlin-generate-and-submit:
     strategy:
       matrix:
         os: ${{fromJSON(inputs.runner-os)}}
@@ -57,20 +71,6 @@ jobs:
     - name: Run gradle build
       run: ./gradlew build
       working-directory: .github/workflow-samples/kotlin-dsl
-  
-  submit:
-    needs: [groovy-generate]
-    runs-on: "ubuntu-latest"
-    steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-    - name: Initialize integ-test
-      uses: ./.github/actions/init-integ-test
-
-    - name: Submit dependency graphs
-      uses: ./setup-gradle
-      with:
-        dependency-graph: download-and-submit
 
   multiple-builds:
     strategy:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cb078599..5f2f2d96 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,6 +30,9 @@ Example running a single job:
 Known issues:
 - `integ-test-cache-cleanup.yml` fails because `gradle` is not installed on the runner. Should be fixed by #33.
 - `integ-test-detect-java-toolchains.yml` fails when running on a `linux/amd64` container, since the expected pre-installed JDKs are not present. Should be fixed by #89.
+- `act` is not yet compatible with `actions/upload-artifact@v4` (or related toolkit functions)
+    - See https://github.com/nektos/act/pull/2224
+- Workflows run by `act` cannot submit to the dependency-submission API, as no `GITHUB_TOKEN` is available by default.
 
 Tips:
 - Add the following lines to `~/.actrc`: