CCM-11971: Move PR Created Workflow before Acceptance Tests

Author: jamesthompson26-nhs

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

@@ -120,31 +120,9 @@ jobs:
       version: "${{ needs.metadata.outputs.version }}"
       pr_number: "${{ needs.metadata.outputs.pr_number }}"
     secrets: inherit
-  pr-create-dynamic-environment:
-    name: Create Dynamic Environment
-    runs-on: ubuntu-latest
-    needs: [metadata, build-stage]
-    steps:
-      - uses: actions/checkout@v5
-      - name: Trigger dynamic environment creation
-        env:
-          APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}
-          APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
-        shell: bash
-        run: |
-          .github/scripts/dispatch_internal_repo_workflow.sh \
-            --infraRepoName "$(echo ${{ github.repository }} | cut -d'/' -f2)" \
-            --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
-            --targetWorkflow "dispatch-deploy-dynamic-env.yaml" \
-            --targetEnvironment "pr${{ github.event.number }}" \
-            --targetComponent "api" \
-            --targetAccountGroup "nhs-notify-supplier-api-dev" \
-            --terraformAction "apply" \
-            --overrideProjectName "nhs" \
-            --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
   acceptance-stage: # Recommended maximum execution time is 10 minutes
     name: "Acceptance stage"
-    needs: [metadata, build-stage, pr-create-dynamic-environment]
+    needs: [metadata, build-stage]
     uses: ./.github/workflows/stage-4-acceptance.yaml
     if: needs.metadata.outputs.does_pull_request_exist == 'true' || (github.event_name == 'pull_request' && (github.event.action == 'opened' || github.event.action == 'reopened')) || (github.event_name == 'push' && github.ref == 'refs/heads/main')
     with:

.github/workflows/stage-3-build.yaml

@@ -87,10 +87,31 @@ jobs:
   #       uses: ./.github/actions/build-libraries
   #       with:
   #         version: "${{ inputs.version }}"
-
+  pr-create-dynamic-environment:
+    name: Create Dynamic Environment
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Trigger dynamic environment creation
+        env:
+          APP_CLIENT_ID: ${{ secrets.APP_CLIENT_ID }}
+          APP_PEM_FILE: ${{ secrets.APP_PEM_FILE }}
+        shell: bash
+        run: |
+          .github/scripts/dispatch_internal_repo_workflow.sh \
+            --infraRepoName "$(echo ${{ github.repository }} | cut -d'/' -f2)" \
+            --releaseVersion "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" \
+            --targetWorkflow "dispatch-deploy-dynamic-env.yaml" \
+            --targetEnvironment "pr${{ github.event.number }}" \
+            --targetComponent "api" \
+            --targetAccountGroup "nhs-notify-supplier-api-dev" \
+            --terraformAction "apply" \
+            --overrideProjectName "nhs" \
+            --overrideRoleName "nhs-main-acct-supplier-api-github-deploy"
   artefact-proxies:
     name: "Build proxies"
     runs-on: ubuntu-latest
+    needs: [pr-create-dynamic-environment]
     timeout-minutes: 10
     env:
       PROXYGEN_API_NAME: nhs-notify-supplier