From 73401b9e6e9f68978d9a4b2e5251094f419636d3 Mon Sep 17 00:00:00 2001
From: Madhavan <msmygit@users.noreply.github.com>
Date: Thu, 7 Dec 2023 08:43:10 -0500
Subject: [PATCH] CI concurrency improvements (#224)

---
 .github/workflows/cdm-integrationtest.yml | 8 +++++---
 .github/workflows/maven.yml               | 8 ++++----
 .github/workflows/snyk-cli-scan.yml       | 6 ++++++
 .github/workflows/snyk-pr-cleanup.yml     | 5 +++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cdm-integrationtest.yml b/.github/workflows/cdm-integrationtest.yml
index 0d180724..a7015962 100644
--- a/.github/workflows/cdm-integrationtest.yml
+++ b/.github/workflows/cdm-integrationtest.yml
@@ -5,11 +5,13 @@ on:
   push:
     branches:
       - main
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
   CDM-Integration-Test:
-    concurrency:
-      group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }}
-      cancel-in-progress: true
     strategy:
       matrix:
         jdk: [ 8 ]
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 615bd276..b1793e8e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,12 +15,12 @@ on:
     branches:
       - main
 
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
 jobs:
   build:
-    concurrency:
-      group: ${{ github.ref }}-${{ github.job }}-${{ matrix.jdk }}-${{ matrix.os }}
-      cancel-in-progress: true
-
     strategy:
       matrix:
         jdk: [ 8 ]
diff --git a/.github/workflows/snyk-cli-scan.yml b/.github/workflows/snyk-cli-scan.yml
index 2952408f..269979b8 100644
--- a/.github/workflows/snyk-cli-scan.yml
+++ b/.github/workflows/snyk-cli-scan.yml
@@ -10,5 +10,11 @@ on:
     branches: [ main ]
   workflow_dispatch:
 
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  #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
index b77b713f..4164eac6 100644
--- a/.github/workflows/snyk-pr-cleanup.yml
+++ b/.github/workflows/snyk-pr-cleanup.yml
@@ -9,3 +9,8 @@ on:
       - main
   workflow_dispatch:
 
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  #group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job || github.run_id }}
+  cancel-in-progress: true
+