Merge pull request #100912 from Repiteo/ci/single-concurrency

CI: Fix GHA bug by defining a single concurrency
This commit is contained in:
Rémi Verschelde 2025-01-03 00:49:25 +01:00
commit 16a4919a51
No known key found for this signature in database
GPG key ID: C3336907360768E1
9 changed files with 1 additions and 33 deletions

View file

@ -8,10 +8,6 @@ env:
GODOT_BASE_BRANCH: master GODOT_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes strict_checks=yes 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: jobs:
build-android: build-android:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04

View file

@ -9,10 +9,6 @@ env:
# Used for the godot-cpp checkout. # Used for the godot-cpp checkout.
GODOT_CPP_BRANCH: 4.3 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: jobs:
godot-cpp-tests: godot-cpp-tests:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04

View file

@ -8,10 +8,6 @@ env:
GODOT_BASE_BRANCH: master GODOT_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes strict_checks=yes 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: jobs:
ios-template: ios-template:
runs-on: macos-latest runs-on: macos-latest

View file

@ -12,10 +12,6 @@ env:
TSAN_OPTIONS: suppressions=misc/error_suppressions/tsan.txt TSAN_OPTIONS: suppressions=misc/error_suppressions/tsan.txt
UBSAN_OPTIONS: suppressions=misc/error_suppressions/ubsan.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: jobs:
build-linux: build-linux:
# Stay one LTS before latest to increase portability of Linux artifacts. # Stay one LTS before latest to increase portability of Linux artifacts.

View file

@ -8,10 +8,6 @@ env:
GODOT_BASE_BRANCH: master GODOT_BASE_BRANCH: master
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes strict_checks=yes 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: jobs:
build-macos: build-macos:
runs-on: macos-latest runs-on: macos-latest

View file

@ -2,7 +2,7 @@ name: 🔗 GHA
on: [push, pull_request, merge_group] on: [push, pull_request, merge_group]
concurrency: concurrency:
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-runner group: ${{ github.workflow }}|${{ github.ref_name }}
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:

View file

@ -2,10 +2,6 @@ name: 📊 Static Checks
on: on:
workflow_call: workflow_call:
concurrency:
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-static
cancel-in-progress: true
jobs: jobs:
static-checks: static-checks:
name: Code style, file formatting, and docs name: Code style, file formatting, and docs

View file

@ -9,10 +9,6 @@ env:
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes strict_checks=yes SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes strict_checks=yes
EM_VERSION: 3.1.64 EM_VERSION: 3.1.64
concurrency:
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-web
cancel-in-progress: true
jobs: jobs:
web-template: web-template:
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04

View file

@ -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 }}/" 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 SCONS_CACHE_MSVC_CONFIG: true
concurrency:
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}-windows
cancel-in-progress: true
jobs: jobs:
build-windows: build-windows:
# Windows 10 with latest image # Windows 10 with latest image