From 2a926f3e61c858ed99d371c015d62cd76c5c32b2 Mon Sep 17 00:00:00 2001
From: Alexander Schwartz <aschwart@redhat.com>
Date: Thu, 28 Jul 2022 20:30:05 +0200
Subject: [PATCH] Abort CodeQL runs on new pushes to a pull-request's branch
 (#13241)

---
 .github/workflows/ci.yml                         | 8 +++-----
 .github/workflows/codeql-java-analysis.yml       | 7 ++++++-
 .github/workflows/codeql-js-adapter-analysis.yml | 7 ++++++-
 .github/workflows/codeql-theme-analysis.yml      | 7 ++++++-
 .github/workflows/operator-ci.yml                | 2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 46cf99c4eac..13a6f569bf7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,10 +3,8 @@ name: Keycloak CI
 on:
   push:
     branches-ignore: [main]
-  pull_request:
-    paths-ignore:
-      - '.github/workflows/**'
-      - '!.github/workflows/ci.yml'
+  # as the ci.yml contains actions that are required for PRs to be merged, it will always need to run on all PRs
+  pull_request: {}
   schedule:
     - cron: '0 0 * * *'
 
@@ -15,7 +13,7 @@ env:
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
-  group: ci-keycloak-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml
index f5a33d17b18..9568efe6325 100644
--- a/.github/workflows/codeql-java-analysis.yml
+++ b/.github/workflows/codeql-java-analysis.yml
@@ -17,7 +17,12 @@ on:
       - '.github/workflows/codeql-java-analysis.yml'
   schedule:
     - cron: '0 9 * * 2'
-    
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: CodeQL analyze
diff --git a/.github/workflows/codeql-js-adapter-analysis.yml b/.github/workflows/codeql-js-adapter-analysis.yml
index 559b0da3cfc..b2bf3d48662 100644
--- a/.github/workflows/codeql-js-adapter-analysis.yml
+++ b/.github/workflows/codeql-js-adapter-analysis.yml
@@ -17,7 +17,12 @@ on:
       - '.github/workflows/codeql-js-adapter-analysis.yml'
   schedule:
     - cron: '0 9 * * 2'
-    
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: CodeQL analyze
diff --git a/.github/workflows/codeql-theme-analysis.yml b/.github/workflows/codeql-theme-analysis.yml
index 1feccc7bd8f..54b1bd08fe8 100644
--- a/.github/workflows/codeql-theme-analysis.yml
+++ b/.github/workflows/codeql-theme-analysis.yml
@@ -17,7 +17,12 @@ on:
       - '.github/workflows/codeql-theme-analysis.yml'
   schedule:
     - cron: '0 9 * * 2'
-    
+
+concurrency:
+  # Only run once for latest commit per ref and cancel other (previous) runs.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: CodeQL analyze
diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml
index 3a684adf182..7bbeadee9e0 100644
--- a/.github/workflows/operator-ci.yml
+++ b/.github/workflows/operator-ci.yml
@@ -17,7 +17,7 @@ env:
 
 concurrency:
   # Only run once for latest commit per ref and cancel other (previous) runs.
-  group: ci-operator-keycloak-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: