From 4f7e04a959a4e91cc42a58c1e833c820d4731f07 Mon Sep 17 00:00:00 2001
From: Thaddeus Crews <repiteo@outlook.com>
Date: Sun, 29 Dec 2024 13:12:41 -0600
Subject: [PATCH] CI: Only define single concurrency

---
 .github/workflows/android_builds.yml | 4 ----
 .github/workflows/godot_cpp_test.yml | 4 ----
 .github/workflows/ios_builds.yml     | 4 ----
 .github/workflows/linux_builds.yml   | 4 ----
 .github/workflows/macos_builds.yml   | 4 ----
 .github/workflows/runner.yml         | 2 +-
 .github/workflows/static_checks.yml  | 4 ----
 .github/workflows/web_builds.yml     | 4 ----
 .github/workflows/windows_builds.yml | 4 ----
 9 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
index 2803ff4b5e8..025c4b2a940 100644
--- a/.github/workflows/android_builds.yml
+++ b/.github/workflows/android_builds.yml
@@ -8,10 +8,6 @@ env:
   GODOT_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes strict_checks=yes
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-android
-  cancel-in-progress: true
-
 jobs:
   build-android:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/godot_cpp_test.yml b/.github/workflows/godot_cpp_test.yml
index ae2fc9388c3..e4013f04938 100644
--- a/.github/workflows/godot_cpp_test.yml
+++ b/.github/workflows/godot_cpp_test.yml
@@ -9,10 +9,6 @@ env:
   # Used for the godot-cpp checkout.
   GODOT_CPP_BRANCH: 4.3
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-cpp-tests
-  cancel-in-progress: true
-
 jobs:
   godot-cpp-tests:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
index 270204ebe50..b1b96e56eb7 100644
--- a/.github/workflows/ios_builds.yml
+++ b/.github/workflows/ios_builds.yml
@@ -8,10 +8,6 @@ env:
   GODOT_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes strict_checks=yes
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-ios
-  cancel-in-progress: true
-
 jobs:
   ios-template:
     runs-on: macos-latest
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index e5c28cab34b..5e5336ea583 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -12,10 +12,6 @@ env:
   TSAN_OPTIONS: suppressions=misc/error_suppressions/tsan.txt
   UBSAN_OPTIONS: suppressions=misc/error_suppressions/ubsan.txt
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-linux
-  cancel-in-progress: true
-
 jobs:
   build-linux:
     # Stay one LTS before latest to increase portability of Linux artifacts.
diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
index 3fedc2a5c9a..7e302d98759 100644
--- a/.github/workflows/macos_builds.yml
+++ b/.github/workflows/macos_builds.yml
@@ -8,10 +8,6 @@ env:
   GODOT_BASE_BRANCH: master
   SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes strict_checks=yes
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-macos
-  cancel-in-progress: true
-
 jobs:
   build-macos:
     runs-on: macos-latest
diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml
index fd5e74b914a..cc67ea7617f 100644
--- a/.github/workflows/runner.yml
+++ b/.github/workflows/runner.yml
@@ -2,7 +2,7 @@ name: 🔗 GHA
 on: [push, pull_request, merge_group]
 
 concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-runner
+  group: ${{ github.workflow }}|${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
index e832faaca47..27580f7c7f1 100644
--- a/.github/workflows/static_checks.yml
+++ b/.github/workflows/static_checks.yml
@@ -2,10 +2,6 @@ name: 📊 Static Checks
 on:
   workflow_call:
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-static
-  cancel-in-progress: true
-
 jobs:
   static-checks:
     name: Code style, file formatting, and docs
diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
index dac6270b2bd..2f253fb82ff 100644
--- a/.github/workflows/web_builds.yml
+++ b/.github/workflows/web_builds.yml
@@ -9,10 +9,6 @@ env:
   SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes strict_checks=yes
   EM_VERSION: 3.1.64
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-web
-  cancel-in-progress: true
-
 jobs:
   web-template:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
index c407ae12d09..843d39dcb23 100644
--- a/.github/workflows/windows_builds.yml
+++ b/.github/workflows/windows_builds.yml
@@ -10,10 +10,6 @@ env:
   SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes d3d12=yes strict_checks=yes "angle_libs=${{ github.workspace }}/"
   SCONS_CACHE_MSVC_CONFIG: true
 
-concurrency:
-  group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-windows
-  cancel-in-progress: true
-
 jobs:
   build-windows:
     # Windows 10 with latest image