Merge pull request #3694 from canonical/update-actions-cancel-behavior

[ci] Update GHA to only cancel for merge queues
canonical · Oct 10, 2024 · 521a43e · 521a43e
2 parents 6dd1800 + a189df4
commit 521a43e
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: true
+  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