From 17d211319b88d81e8af776d77874a0a9b2252fcd Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 27 Jul 2023 06:26:03 +0200
Subject: [PATCH] Change concurrency for GH workflows to prevent conflicts
 between PRs (#22018)

Closes #22001
---
 .github/workflows/ci.yml              | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/documentation.yml   | 2 +-
 .github/workflows/guides.yml          | 2 +-
 .github/workflows/js-ci.yml           | 2 +-
 .github/workflows/operator-ci.yml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12a53d9a2f..182bf0ff41 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ env:
 
 concurrency:
   # Only cancel jobs for PR updates
-  group: ci-${{ github.head_ref || github.run_id }}
+  group: ci-${{ github.ref }}
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3dcc72012d..a93c678017 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -11,7 +11,7 @@ on:
 
 concurrency:
   # Only cancel jobs for PR updates
-  group: codeql-analysis-${{ github.head_ref || github.run_id }}
+  group: codeql-analysis-${{ github.ref }}
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index a5e29008d9..65898867fb 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -10,7 +10,7 @@ on:
 
 concurrency:
   # Only cancel jobs for PR updates
-  group: documentation-${{ github.head_ref || github.run_id }}
+  group: documentation-${{ github.ref }}
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/guides.yml b/.github/workflows/guides.yml
index 7925479d5a..b295581ff5 100644
--- a/.github/workflows/guides.yml
+++ b/.github/workflows/guides.yml
@@ -10,7 +10,7 @@ on:
 
 concurrency:
   # Only cancel jobs for PR updates
-  group: guides-${{ github.head_ref || github.run_id }}
+  group: guides-${{ github.ref }}
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/js-ci.yml b/.github/workflows/js-ci.yml
index 31af10a4b7..453289eca7 100644
--- a/.github/workflows/js-ci.yml
+++ b/.github/workflows/js-ci.yml
@@ -10,7 +10,7 @@ on:
 
 concurrency:
   # Only cancel jobs for PR updates
-  group: js-ci-${{ github.head_ref || github.run_id }}
+  group: js-ci-${{ github.ref }}
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/operator-ci.yml b/.github/workflows/operator-ci.yml
index 9d323bab8d..a6221288be 100644
--- a/.github/workflows/operator-ci.yml
+++ b/.github/workflows/operator-ci.yml
@@ -18,7 +18,7 @@ defaults:
 
 concurrency:
   # Only cancel jobs for PR updates
-  group: operator-ci-${{ github.head_ref || github.run_id }}
+  group: operator-ci-${{ github.ref }}
   cancel-in-progress: true
 
 jobs: