From 5cc49cf881cc0778485547f63e620564c28a17bb Mon Sep 17 00:00:00 2001
From: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Date: Thu, 30 Mar 2023 14:01:55 +0300
Subject: [PATCH] Include workflow name in the context ref (#22728)

---
 .github/workflows/channels-ci.yml         | 2 +-
 .github/workflows/ci.yml                  | 2 +-
 .github/workflows/codeql-analysis.yml     | 2 +-
 .github/workflows/e2e-tests-ci.yml        | 2 +-
 .github/workflows/scorecards-analysis.yml | 4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/channels-ci.yml b/.github/workflows/channels-ci.yml
index 39e76631f04..28165d4a564 100644
--- a/.github/workflows/channels-ci.yml
+++ b/.github/workflows/channels-ci.yml
@@ -7,7 +7,7 @@ on:
       - mono-repo*
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ !contains( github.ref , 'heads/ref/master') }}
 defaults:
   run:
     shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6dedcdeb757..2d2886c03ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ env:
   go-version: "1.19.5"
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ !contains( github.ref , 'heads/ref/master') }}
 jobs:
   check-mocks:
     name: Check mocks
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 597302f9007..a554f95b312 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,7 +2,7 @@ name: "CodeQL"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ !contains( github.ref , 'heads/ref/master') }}
 
 on:
   pull_request:
diff --git a/.github/workflows/e2e-tests-ci.yml b/.github/workflows/e2e-tests-ci.yml
index 89c7cbfeed0..d620d695558 100644
--- a/.github/workflows/e2e-tests-ci.yml
+++ b/.github/workflows/e2e-tests-ci.yml
@@ -7,7 +7,7 @@ on:
       - mono-repo*
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ !contains( github.ref , 'heads/ref/master') }}
 defaults:
   run:
     shell: bash
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
index 9a5a652abbf..01522a547c7 100644
--- a/.github/workflows/scorecards-analysis.yml
+++ b/.github/workflows/scorecards-analysis.yml
@@ -5,6 +5,10 @@ on:
   schedule:
     - cron: '44 6 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ !contains( github.ref , 'heads/ref/master') }}
+
 # Declare default permissions as read only.
 permissions: read-all