Merge branch 'feature/PI-130-move_check_branch_name_to_the_beginning_…

…of_ci' into release/2023-11-24
NHSDigital · Nov 27, 2023 · 7aee3ff · 7aee3ff
2 parents 011cb6d + fb84743
commit 7aee3ff
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -17,15 +17,27 @@ env:
   TF_CLI_ARGS: -no-color
 
 jobs:
+  workflow--check--branch-name:
+    runs-on: [self-hosted, ci]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.BRANCH_NAME }}
+      - uses: ./.github/actions/make/
+        with:
+          command: workflow--check--branch-name
+
   parse-secrets:
     runs-on: [self-hosted, ci]
+    needs: [workflow--check--branch-name]
     steps:
       - id: parse-secrets
         run: |
           echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
 
   create-workspace-name:
     runs-on: [self-hosted, ci]
+    needs: [workflow--check--branch-name]
     outputs:
       workspace: ${{ steps.create_workspace_name.outputs.workspace }}
     steps:
@@ -38,16 +50,6 @@ jobs:
             echo "workspace=ci-$(echo ${{ env.BRANCH_NAME }} | sed -n 's/.*\/\([^-]*\)-\([^-]*\).*/\1-\2/p')-${{ env.BRANCH_GITHUB_SHA_SHORT }}" >> $GITHUB_OUTPUT
           fi
 
-  workflow--check--branch-name:
-    runs-on: [self-hosted, ci]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ env.BRANCH_NAME }}
-      - uses: ./.github/actions/make/
-        with:
-          command: workflow--check--branch-name
-
   build-head:
     runs-on: [self-hosted, ci]
     needs: [parse-secrets]
@@ -61,6 +63,7 @@ jobs:
 
   build-base:
     runs-on: [self-hosted, ci]
+    needs: [workflow--check--branch-name]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -72,7 +75,7 @@ jobs:
 
   workflow--codebase-checks:
     runs-on: [self-hosted, ci]
-    needs: [workflow--check--branch-name, build-head]
+    needs: [build-head]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -108,6 +111,7 @@ jobs:
 
   helpers--truststore-pull:
     runs-on: [self-hosted, ci]
+    needs: [workflow--check--branch-name]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -187,7 +191,7 @@ jobs:
 
   destroy-redundant-workspaces:
     runs-on: [self-hosted, ci]
-    needs: [workflow--check--branch-name, build-head]
+    needs: [build-head]
     steps:
       - uses: actions/checkout@v4
         with: