Merge remote-tracking branch 'origin' into feature/CCM-10429_templates_and_s3_files_migration

Author: m-salaudeen

.github/actions/node-modules-cache/action.yaml

@@ -0,0 +1,44 @@
+name: 'Node modules cache + setup'
+description: 'Setup Node, restore node_modules cache, and optionally run npm ci on cache miss'
+
+inputs:
+  node_version:
+    description: 'Node.js version'
+    required: true
+  cache_lock_path:
+    description: 'Path(s) to package-lock.json for cache key'
+    required: false
+    default: '**/package-lock.json'
+  skip_restore:
+    description: 'Skips restoring node_modules'
+    required: false
+    default: false
+
+runs:
+  using: 'composite'
+  steps:
+    - name: 'Use Node.js'
+      uses: actions/setup-node@v5
+      with:
+        cache: 'npm'
+        cache-dependency-path: '${{ inputs.cache_lock_path }}'
+        node-version: '${{ inputs.node_version }}'
+        package-manager-cache: true
+
+    - name: 'Restore node_modules from cache'
+      id: node-modules-cache
+      uses: actions/cache@v4
+      with:
+        path: |
+          node_modules
+          **/node_modules
+        key: ${{ runner.os }}-node-${{ inputs.node_version }}-${{ hashFiles(inputs.cache_lock_path) }}
+        restore-keys: |
+          ${{ runner.os }}-node-${{ inputs.node_version }}-
+        lookup-only: ${{ inputs.skip_restore }}
+
+    - name: 'Install dependencies (cache miss)'
+      if: steps.node-modules-cache.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        npm ci

.github/actions/test-types.json

@@ -3,5 +3,6 @@
   "api",
   "event",
   "ui-component",
-  "ui-e2e"
+  "ui-e2e",
+  "ui-user-timeout"
 ]

.github/workflows/stage-2-test.yaml

@@ -41,98 +41,163 @@ permissions:
   contents: read  # This is required for actions/checkout
 
 jobs:
+  install-dependencies:
+    name: "Install dependencies"
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: "Checkout code"
+        uses: actions/[email protected]
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
+          skip_restore: true
+
+  discover-workspaces:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.get-workspaces.outputs.matrix }}
+    steps:
+      - name: "Checkout code"
+        uses: actions/[email protected]
+      - name: "Get workspaces"
+        id: "get-workspaces"
+        run: |
+          echo "matrix=$(jq -c '.workspaces' package.json)" >> "$GITHUB_OUTPUT"
+
   check-generated-dependencies:
     name: "Check generated dependencies"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    needs: [install-dependencies]
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Repo setup"
-        run: |
-          npm ci
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
           git diff --exit-code
+
   test-unit:
     name: "Unit tests"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    needs: [install-dependencies, discover-workspaces]
+    strategy:
+      fail-fast: false
+      matrix:
+        workspace: ${{ fromJSON(needs.discover-workspaces.outputs.matrix) }}
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Repo setup"
-        run: |
-          npm ci
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
       - name: "Run unit test suite"
         run: |
-          make test-unit
-      - name: "Save the result of fast test suite"
+          WORKSPACE=${{ matrix.workspace }} make test-unit
+      - name: Compute safe artifact names
+        id: names
+        shell: bash
+        run: |
+          echo "safe=$(echo '${{ matrix.workspace }}' | tr '/' '-_')" >> "$GITHUB_OUTPUT"
+      - name: "Save the result of test suite"
         uses: actions/upload-artifact@v4
         with:
-          name: unit-tests
-          path: "**/.reports/unit"
+          name: unit-tests-${{ steps.names.outputs.safe }}
+          path: "${{ matrix.workspace }}/.reports/unit"
           include-hidden-files: true
+          if-no-files-found: ignore
         if: always()
       - name: "Save the result of code coverage"
         uses: actions/upload-artifact@v4
         with:
-          name: code-coverage-report
-          path: ".reports/lcov.info"
+          name: code-coverage-${{ steps.names.outputs.safe }}
+          path: "${{ matrix.workspace }}/.reports/unit/coverage/lcov.info"
+          if-no-files-found: ignore
         if: always()
+
   test-lint:
     name: "Linting"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    needs: [install-dependencies]
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Repo setup"
-        run: |
-          npm ci
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
       - name: "Run linting"
         run: |
           make test-lint
+
   test-typecheck:
     name: "Typecheck"
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    needs: [install-dependencies]
     steps:
       - name: "Checkout code"
         uses: actions/[email protected]
-      - name: "Repo setup"
-        run: |
-          npm ci
+      - name: "Restore node_modules from cache"
+        uses: ./.github/actions/node-modules-cache
+        with:
+          node_version: "${{ inputs.nodejs_version }}"
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
       - name: "Run typecheck"
         run: |
           make test-typecheck
-  test-coverage:
-    name: "Test coverage"
-    needs: [test-unit]
+
+  merge-coverage:
+    name: "Merge coverage"
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    needs: [test-unit]
     steps:
-      - name: "Checkout code"
-        uses: actions/[email protected]
-      - name: "Run test coverage check"
-        run: |
-          make test-coverage
-      - name: "Save the coverage check result"
+      - uses: actions/checkout@v5
+
+      - name: Download coverage artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: code-coverage-*
+          merge-multiple: false
+          path: ./_cov_parts
+
+      - name: Merge LCOV files
         run: |
-          echo "Nothing to save"
+          set -euo pipefail
+          mkdir -p .reports
+          npx --yes lcov-result-merger \
+            "./_cov_parts/**/lcov.info" \
+            ".reports/lcov.info" \
+            --ignore "node_modules" \
+            --prepend-source-files \
+            --prepend-path-fix "../../"
+
+      - name: Upload merged LCOV
+        uses: actions/upload-artifact@v4
+        with:
+          name: code-coverage-report
+          path: .reports/lcov.info
+
   perform-static-analysis:
     name: "Perform static analysis"
-    needs: [test-unit]
+    needs: [test-unit, merge-coverage]
     runs-on: ubuntu-latest
     permissions:
       id-token: write

.tool-versions

@@ -7,7 +7,7 @@ terraform 1.10.1
 terraform-docs 0.19.0
 trivy 0.61.0
 vale 3.6.0
-# python 3.13.2
+python 3.13.2
 
 # ==============================================================================
 # The section below is reserved for Docker image versions.

frontend/package.json

@@ -14,7 +14,7 @@
     "next-client-cookies": "^2.0.1",
     "nhs-notify-backend-client": "^0.0.1",
     "nhs-notify-web-template-management-utils": "^0.0.1",
-    "nhsuk-frontend": "^9.3.0",
+    "nhsuk-frontend": "^10.0.0",
     "nhsuk-react-components": "^5.0.0",
     "path": "^0.12.7",
     "react": "^19.0.0",