ci: allow parallel merge queue builds (#2850)

wireapp · Jun 28, 2024 · 088ed25 · 088ed25
1 parent 2453ab8
commit 088ed25
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/benchmarks-check.yml b/.github/workflows/benchmarks-check.yml
@@ -6,7 +6,7 @@ on:
     workflow_dispatch:
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
     cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/gradle-android-instrumented-tests.yml b/.github/workflows/gradle-android-instrumented-tests.yml
@@ -6,7 +6,7 @@ on:
         types: [ opened, synchronize ] # Don't rerun on `edited` to save time
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
     cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/gradle-android-unit-tests.yml b/.github/workflows/gradle-android-unit-tests.yml
@@ -6,7 +6,7 @@ on:
         types: [ opened, synchronize ] # Don't rerun on `edited` to save time
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
     cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/gradle-ios-tests.yml b/.github/workflows/gradle-ios-tests.yml
@@ -6,7 +6,7 @@ on:
     types: [ opened, synchronize ] # Don't rerun on `edited` to save time
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
     cancel-in-progress: true
 
 jobs:

diff --git a/.github/workflows/gradle-jvm-tests.yml b/.github/workflows/gradle-jvm-tests.yml
@@ -9,7 +9,7 @@ on:
         - 'develop'
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+    group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.merge_group.head_sha }}
     cancel-in-progress: true
 
 jobs: