From 513ef8f2f501b3d257b22d52d741a503590b0077 Mon Sep 17 00:00:00 2001
From: harupy <17039389+harupy@users.noreply.github.com>
Date: Mon, 10 Jan 2022 17:54:49 +0900
Subject: [PATCH 1/2] Fix concurrency group value to avoid cancelling runs on
 push to master branch

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>
---
 .github/workflows/cross-version-tests.yml   | 4 ++--
 .github/workflows/examples.yml              | 4 ++--
 .github/workflows/master.yml                | 4 ++--
 .github/workflows/release-note-category.yml | 4 ++--
 .github/workflows/test-package-build.yml    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/cross-version-tests.yml b/.github/workflows/cross-version-tests.yml
index 829dcd35a204c..368bd83c45fae 100644
--- a/.github/workflows/cross-version-tests.yml
+++ b/.github/workflows/cross-version-tests.yml
@@ -32,8 +32,8 @@ on:
       - master
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  cancel-in-progress: true
 
 defaults:
   run:
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index efcffc4661baa..a1399dd5434b4 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -8,8 +8,8 @@ on:
     - cron: "0 7 * * *"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  cancel-in-progress: true
 
 defaults:
   run:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index fba88ff2a4720..edc417a809a24 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -11,8 +11,8 @@ on:
       - branch-[0-9]+.[0-9]+
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  cancel-in-progress: true
 
 # Use `bash --noprofile --norc -exo pipefail` by default for all `run` steps in this workflow:
 # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#defaultsrun
diff --git a/.github/workflows/release-note-category.yml b/.github/workflows/release-note-category.yml
index af77fd15c79cb..37e36bf7d14b5 100644
--- a/.github/workflows/release-note-category.yml
+++ b/.github/workflows/release-note-category.yml
@@ -12,8 +12,8 @@ on:
       - unlabeled
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  cancel-in-progress: true
 
 defaults:
   run:
diff --git a/.github/workflows/test-package-build.yml b/.github/workflows/test-package-build.yml
index ab569814738e7..22c39f670e142 100644
--- a/.github/workflows/test-package-build.yml
+++ b/.github/workflows/test-package-build.yml
@@ -7,8 +7,8 @@ on:
     branches: [master]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  cancel-in-progress: true
 
 defaults:
   run:

From d76dd924277865583c7b34d9188f4d14eeb08fb3 Mon Sep 17 00:00:00 2001
From: harupy <17039389+harupy@users.noreply.github.com>
Date: Mon, 10 Jan 2022 17:58:15 +0900
Subject: [PATCH 2/2] fix

Signed-off-by: harupy <17039389+harupy@users.noreply.github.com>
---
 .github/workflows/cross-version-tests.yml | 2 +-
 .github/workflows/examples.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cross-version-tests.yml b/.github/workflows/cross-version-tests.yml
index 368bd83c45fae..5ece206b074d8 100644
--- a/.github/workflows/cross-version-tests.yml
+++ b/.github/workflows/cross-version-tests.yml
@@ -32,7 +32,7 @@ on:
       - master
 
 concurrency:
-  group: group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
   cancel-in-progress: true
 
 defaults:
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index a1399dd5434b4..444b0a64c2b0a 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -8,7 +8,7 @@ on:
     - cron: "0 7 * * *"
 
 concurrency:
-  group: group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/master' && github.run_number || github.ref }}
   cancel-in-progress: true
 
 defaults: