CI concurrency improvements

datastax · Dec 1, 2023 · d67c681 · d67c681
1 parent 83ac69d
commit d67c681
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/cdm-integrationtest.yml b/.github/workflows/cdm-integrationtest.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   CDM-Integration-Test:
     concurrency:
-      group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}-${{ matrix.jdk }}-${{ matrix.os }}
       cancel-in-progress: true
     strategy:
       matrix:

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   build:
     concurrency:
-      group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }}
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}-${{ matrix.jdk }}-${{ matrix.os }}
       cancel-in-progress: true
 
     strategy:

diff --git a/.github/workflows/snyk-cli-scan.yml b/.github/workflows/snyk-cli-scan.yml
@@ -10,5 +10,10 @@ on:
     branches: [ main ]
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}
+  cancel-in-progress: true
+
 env:
   SNYK_SEVERITY_THRESHOLD_LEVEL: critical
+
diff --git a/.github/workflows/snyk-pr-cleanup.yml b/.github/workflows/snyk-pr-cleanup.yml
@@ -9,3 +9,6 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}
+  cancel-in-progress: true