Switch to a different approach which still allows manual cancellation.

Author: mfjarvis

.github/workflows/deploy-backend.yml

@@ -78,9 +78,6 @@ jobs:
         run: make init
 
       - name: Terraform Plan
-        # Ignore cancellations to prevent Terraform from being killed while it holds a state lock
-        # A stuck process can still be killed with the force-cancel API operation
-        if: ${{ !failure() }}
         working-directory: infrastructure/instance
         run: make plan-ci
 
@@ -123,9 +120,6 @@ jobs:
         run: make init
 
       - name: Terraform Apply
-        # Ignore cancellations to prevent Terraform from being killed while it holds a state lock
-        # A stuck process can still be killed with the force-cancel API operation
-        if: ${{ !failure() }}
         working-directory: infrastructure/instance
         run: |
           make apply-ci

.github/workflows/pr-deploy-and-test.yml

@@ -4,17 +4,20 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   run-quality-checks:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     uses: ./.github/workflows/quality-checks.yml
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   deploy-pr-backend:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      # Avoid automatic cancellation while Terraform holds a state lock
+      cancel-in-progress: false
     needs: [run-quality-checks]
     uses: ./.github/workflows/deploy-backend.yml
     with:
@@ -24,6 +27,9 @@ jobs:
       sub_environment: pr-${{github.event.pull_request.number}}
 
   run-e2e-automation-tests:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     needs: [deploy-pr-backend]
     strategy:
       matrix: