From fe6eb9d970ee1e00ea0ac6372b26ab317069c364 Mon Sep 17 00:00:00 2001
From: Madhavan Sridharan <madhavan.sridharan@datastax.com>
Date: Fri, 1 Dec 2023 14:55:52 -0500
Subject: [PATCH] CI concurrency improvements

---
 .github/workflows/cdm-integrationtest.yml | 2 +-
 .github/workflows/maven.yml               | 2 +-
 .github/workflows/snyk-cli-scan.yml       | 4 ++++
 .github/workflows/snyk-pr-cleanup.yml     | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cdm-integrationtest.yml b/.github/workflows/cdm-integrationtest.yml
index 0d180724..05d0d37f 100644
--- 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
index 615bd276..5cd7b4c9 100644
--- 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
index 2952408f..57c173f5 100644
--- a/.github/workflows/snyk-cli-scan.yml
+++ b/.github/workflows/snyk-cli-scan.yml
@@ -12,3 +12,7 @@ on:
 
 env:
   SNYK_SEVERITY_THRESHOLD_LEVEL: critical
+
+concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}
+      cancel-in-progress: true
diff --git a/.github/workflows/snyk-pr-cleanup.yml b/.github/workflows/snyk-pr-cleanup.yml
index b77b713f..483765f9 100644
--- a/.github/workflows/snyk-pr-cleanup.yml
+++ b/.github/workflows/snyk-pr-cleanup.yml
@@ -9,3 +9,7 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}
+      cancel-in-progress: true
+