Merge remote-tracking branch 'upstream/master' into feature/perf

xapi-project · Sep 18, 2024 · 75085cb · 75085cb
2 parents eac591c + 7e9c2a3
commit 75085cb
Show file tree

Hide file tree

Showing 11 changed files with 569 additions and 225 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,7 @@ on:
   merge_group:
 
 concurrency: # On new push, cancel old workflows from the same PR, branch or tag:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{github.event_name}}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
@@ -9,7 +9,7 @@ on:
   merge_group:
 
 concurrency: # On new push, cancel old workflows from the same PR, branch or tag:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-${{github.event_name}}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/shellcheck.yaml b/.github/workflows/shellcheck.yaml
@@ -5,7 +5,7 @@ on:
   merge_group:
 
 concurrency:  # On new push, cancel old workflows from the same PR, branch or tag:
-  group: sc-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: sc-${{ github.workflow }}-${{github.event_name}}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs: