CI: Add concurrency to CI-Mac/Win + newer-Java workflows (#7785)

projectnessie · Dec 1, 2023 · 931e937 · 931e937
1 parent 26cb495
commit 931e937
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/.github/workflows/ci-mac.yml b/.github/workflows/ci-mac.yml
@@ -25,6 +25,16 @@ on:
     - cron:  '0 4 * * 1-5'
   workflow_dispatch:
 
+# For the main branch: let all CI runs complete, one after the other. This has a couple advantages:
+# * Site deployments happen in commit-order
+# * Saved Gradle cache are persisted in commit-order
+# * (Potentially) more GH runners available for PRs
+concurrency:
+  # PRs: 1 CI run concurrently / older ones are cancelled
+  # main branch: 1 CI run concurrently / all commits / no cancellation
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   java:
     name: Java/Gradle macOS

diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml
@@ -25,6 +25,16 @@ on:
     - cron:  '0 4 * * 1-5'
   workflow_dispatch:
 
+# For the main branch: let all CI runs complete, one after the other. This has a couple advantages:
+# * Site deployments happen in commit-order
+# * Saved Gradle cache are persisted in commit-order
+# * (Potentially) more GH runners available for PRs
+concurrency:
+  # PRs: 1 CI run concurrently / older ones are cancelled
+  # main branch: 1 CI run concurrently / all commits / no cancellation
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   java:
     name: Java/Gradle Windows

diff --git a/.github/workflows/newer-java.yml b/.github/workflows/newer-java.yml
@@ -8,6 +8,16 @@ on:
     - cron:  '0 4 * * 1-5'
   workflow_dispatch:
 
+# For the main branch: let all CI runs complete, one after the other. This has a couple advantages:
+# * Site deployments happen in commit-order
+# * Saved Gradle cache are persisted in commit-order
+# * (Potentially) more GH runners available for PRs
+concurrency:
+  # PRs: 1 CI run concurrently / older ones are cancelled
+  # main branch: 1 CI run concurrently / all commits / no cancellation
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   java:
     name: Exercise Java version
@@ -17,7 +27,6 @@ jobs:
       max-parallel: 1
       matrix:
         include:
-          - java-version: 17
           - java-version: 21
     env:
       SPARK_LOCAL_IP: localhost