From 116664285d9a4e37e75d091a924673b71fc1522f Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Wed, 2 Mar 2022 13:26:13 +0800
Subject: [PATCH] GHA CI: Don't cancel CI builds on non-pull-request branches

Fix up 2652c73a4fabd7bb85916e99c289dc58cad8f895.
PR #16558.
---
 .github/workflows/ci_file_health.yaml | 2 +-
 .github/workflows/ci_macos.yaml       | 2 +-
 .github/workflows/ci_ubuntu.yaml      | 2 +-
 .github/workflows/ci_webui.yaml       | 2 +-
 .github/workflows/ci_windows.yaml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci_file_health.yaml b/.github/workflows/ci_file_health.yaml
index 0732f35aa..57fbe68f9 100644
--- a/.github/workflows/ci_file_health.yaml
+++ b/.github/workflows/ci_file_health.yaml
@@ -3,7 +3,7 @@ name: CI - File health
 on: [pull_request, push]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: ${{ github.head_ref != '' }}
 
 jobs:
diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 14cf5b87c..5e9f88c3b 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -3,7 +3,7 @@ name: CI - macOS
 on: [pull_request, push]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: ${{ github.head_ref != '' }}
 
 jobs:
diff --git a/.github/workflows/ci_ubuntu.yaml b/.github/workflows/ci_ubuntu.yaml
index 762795a81..141c29149 100644
--- a/.github/workflows/ci_ubuntu.yaml
+++ b/.github/workflows/ci_ubuntu.yaml
@@ -3,7 +3,7 @@ name: CI - Ubuntu
 on: [pull_request, push]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: ${{ github.head_ref != '' }}
 
 jobs:
diff --git a/.github/workflows/ci_webui.yaml b/.github/workflows/ci_webui.yaml
index bf4542a3b..6ffaf768d 100644
--- a/.github/workflows/ci_webui.yaml
+++ b/.github/workflows/ci_webui.yaml
@@ -3,7 +3,7 @@ name: CI - WebUI
 on: [pull_request, push]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: ${{ github.head_ref != '' }}
 
 jobs:
diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml
index 813e8047c..38d2357f6 100644
--- a/.github/workflows/ci_windows.yaml
+++ b/.github/workflows/ci_windows.yaml
@@ -3,7 +3,7 @@ name: CI - Windows
 on: [pull_request, push]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref }}
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: ${{ github.head_ref != '' }}
 
 jobs: