Merge pull request #731 from NHSDigital/DTOSS-11666-delete-review-cancelled

[DTOSS-11666] Update github actions concurrency

Author: saliceti

.github/workflows/cicd-1-pull-request-closed.yaml

@@ -13,7 +13,8 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     environment: review
-    concurrency: deploy-review-${{ github.ref }}
+    # Prevent concurrent jobs on the same environment and between deploy and delete workflows
+    concurrency: deploy-review-${{ github.event.pull_request.number }}
 
     steps:
       - name: Checkout code

.github/workflows/cicd-2-main-branch.yaml

@@ -4,6 +4,9 @@ on:
   push:
     branches: [main]
 
+# Set concurrency at the workflow level to ensure the same commit runs tests and deployment consistently
+concurrency: deploy-workflow-main
+
 jobs:
   metadata:
     name: 'Set CI/CD metadata'

.github/workflows/stage-4-deploy.yaml

@@ -25,7 +25,8 @@ jobs:
         environment: ${{ fromJson(inputs.environments) }}
       max-parallel: 1
     environment: ${{ matrix.environment }}
-    concurrency: deploy-${{ matrix.environment }}-${{ github.ref }}
+    # Prevent concurrent jobs on the same environment and between deploy and delete workflows
+    concurrency: deploy-${{ matrix.environment }}-${{inputs.pr_number}}
 
     steps:
       - name: Checkout code