Revert "Refactor build steps"

This reverts commit a2701673e205c185a711bfa1744ee328b2df770f.

Author: stevebux

.github/actions/build-oas-spec/action.yml

@@ -25,11 +25,40 @@ inputs:
     description: "Name of the Component to deploy"
     required: true
     default: 'api'
+  nodejs_version:
+    description: "Node.js version, set by the CI/CD pipeline workflow"
+    required: true
+  NODE_AUTH_TOKEN:
+    description: "Token for access to github package registry"
+    required: true
 
 runs:
   using: composite
 
   steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.nodejs_version }}
+        registry-url: 'https://npm.pkg.github.com'
+
+    - name: "Cache node_modules"
+      uses: actions/cache@v4
+      with:
+        path: |
+          **/node_modules
+        key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+
+    - name: Npm install
+      working-directory: .
+      env:
+        NODE_AUTH_TOKEN: ${{ inputs.NODE_AUTH_TOKEN }}
+      run: npm ci
+      shell: bash
+
     - name: Setup Proxy Name and target
       shell: bash
       run: |
@@ -58,6 +87,27 @@ runs:
           echo "MTLS_NAME=notify-supplier-mtls-pr$PR_NUMBER" >> $GITHUB_ENV
         fi
 
+    - name: Build ${{ inputs.apimEnv }} oas
+      working-directory: .
+      env:
+        APIM_ENV: ${{ inputs.apimEnv }}
+      shell: bash
+      run: |
+        if [ ${{ env.APIM_ENV }} == "internal-dev-sandbox" ] && [ ${{ inputs.buildSandbox }} == true ]
+        then
+          echo "Building sandbox OAS spec"
+          make build-json-oas-spec APIM_ENV=sandbox
+        else
+          echo "Building env specific OAS spec"
+          make build-json-oas-spec APIM_ENV=${{ env.APIM_ENV }}
+        fi
+
+        if [[ $APIM_ENV == *-pr ]]; then
+          echo "Removing pr suffix from APIM_ENV after building OAS and calling proxygen"
+          APIM_ENV=$(echo "$APIM_ENV" | sed 's/-pr$//')
+        fi
+        echo "APIM_ENV=$APIM_ENV" >> $GITHUB_ENV
+
     - name: Upload OAS Spec
       uses: actions/upload-artifact@v4
       with:
@@ -66,7 +116,6 @@ runs:
 
     - name: Trigger deploy proxy
       env:
-        APIM_ENV: ${{ inputs.apimEnv }}
         APP_CLIENT_ID: ${{ env.APP_CLIENT_ID }}
         APP_PEM_FILE: ${{ env.APP_PEM_FILE }}
       shell: bash

.github/actions/build-proxies/action.yml

@@ -55,6 +55,12 @@ runs:
       run: |
         make build VERSION="${{ inputs.version }}"
 
+    - name: Upload API OAS specification artifact
+      uses: actions/upload-artifact@v4
+      with:
+        path: "build"
+        name: api-oas-specification-${{ inputs.version }}
+
     - name: Upload html artifact
       uses: actions/upload-artifact@v4
       with:

.github/actions/build-sdk/action.yml

@@ -55,26 +55,9 @@ jobs:
           version: "${{ inputs.version }}"
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  artefact-oas-spec:
-    name: "Build OAS spec"
-    runs-on: ubuntu-latest
-    needs: [artefact-jekyll-docs]
-    timeout-minutes: 10
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v5
-      - name: "Build proxies"
-        uses: ./.github/actions/build-oas-spec
-        with:
-          apimEnv: "internal-dev-sandbox"
-          buildSandbox: true
-          nodejs_version: ${{ inputs.nodejs_version }}
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
   artefact-sdks:
     name: "Build SDKs"
     runs-on: ubuntu-latest
-    needs: [artefact-oas-spec]
     timeout-minutes: 10
     steps:
       - name: "Checkout code"
@@ -134,7 +117,7 @@ jobs:
   artefact-proxies:
     name: "Build proxies"
     runs-on: ubuntu-latest
-    needs: [artefact-oas-spec, pr-create-dynamic-environment]
+    needs: [pr-create-dynamic-environment]
     timeout-minutes: 10
     env:
       PROXYGEN_API_NAME: nhs-notify-supplier
@@ -153,3 +136,5 @@ jobs:
           runId: "${{ github.run_id }}"
           buildSandbox: true
           releaseVersion: ${{ github.head_ref || github.ref_name }}
+          nodejs_version: ${{ inputs.nodejs_version }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}