[ci] Set fail-fast conditionally

canonical · Oct 9, 2024 · a189df4 · a189df4
1 parent ef00c56
commit a189df4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.number && format('pr{0}', github.event.number) || github.run_id }}
-  cancel-in-progress: ${{ contains('merge_group', github.event_name) }}
+  cancel-in-progress: ${{ github.event_name == 'merge_group' }}
 
 jobs:
   Lint:
@@ -73,6 +73,7 @@ jobs:
 
     strategy:
       matrix: ${{ fromJSON(needs.GetMatrix.outputs.matrix) }}
+      fail-fast: ${{ github.event_name == 'merge_group' }}
 
     runs-on: ubuntu-latest