Merge branch 'main' into feature/CCM-12616_mesh_poll_retrieve

Author: lapenna-bjss

.coverage

@@ -0,0 +1,10 @@
+{
+  "containerEnv": {
+    "GITHUBMONITOR": "false",
+    "MAKECONFIG": "true",
+    "SHOWWELCOME": "true",
+    "UPDATEFROMTEMPLATE": "false"
+  },
+  "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-loaded-codespaces:main",
+  "name": "Codespaces Online Development"
+}

.devcontainer/devcontainer.json

@@ -5,8 +5,7 @@
     "SHOWWELCOME": "true",
     "UPDATEFROMTEMPLATE": "false"
   },
-  "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-loaded:1.0.16",
-  "name": "Notify Loaded Dev Container 1.0.16",
-  "postCreateCommand": "echo My own container created",
-  "postStartCommand": "echo My own container started"
+  "image": "ghcr.io/nhsdigital/nhs-notify-devcontainer-loaded:1.0.17",
+  "name": "Notify Loaded 1.0.17",
+  "postStartCommand": "mkdir -p ~/.gnupg && echo '## 1-day timeout' > ~/.gnupg/gpg-agent.conf && echo 'default-cache-ttl 86400' >> ~/.gnupg/gpg-agent.conf && echo 'max-cache-ttl 86400' >> ~/.gnupg/gpg-agent.conf && gpg-connect-agent reloadagent /bye 2>/dev/null || true"
 }

.devcontainer/nhs-notify-devcontainer-loaded/devcontainer.json

@@ -0,0 +1,55 @@
+name: Acceptance tests
+description: "Run acceptance tests for this repo"
+
+inputs:
+  testType:
+    description: Type of test to run
+    required: true
+    default: main
+
+  targetEnvironment:
+    description: Name of the environment under test
+    required: true
+    default: main
+
+  targetAccountGroup:
+    description: Name of the account group under test
+    default: nhs-notify-digital-letters-dev
+    required: true
+
+  targetComponent:
+    description: Name of the component under test
+    default: dl
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: "Repo setup"
+      shell: bash
+      run: |
+        npm ci
+
+    - name: Run test - ${{ inputs.testType }}
+      shell: bash
+      run: |
+        set -euo pipefail
+        case "$TEST_TYPE" in
+          main|integration|unit)
+            make "test-$TEST_TYPE"
+            ;;
+          *)
+            echo "Invalid testType: $TEST_TYPE" >&2
+            exit 1
+            ;;
+        esac
+      env:
+        TEST_TYPE: ${{ inputs.testType }}
+        ENVIRONMENT: ${{ inputs.targetEnvironment }}
+
+    - name: Archive integration test results
+      if: ${{ inputs.testType == 'integration' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: Integration test report
+        path: "tests/playwright/playwright-report"

.devcontainer/old/devcontainer.json

@@ -8,20 +8,20 @@ runs:
   using: "composite"
   steps:
     - name: Checkout
-      uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
+      uses: actions/checkout@v5
+    - uses: actions/setup-node@v6
       with:
-        node-version: 18
+        node-version: 24
     - name: Npm cli install
       working-directory: ./docs
       run: npm ci
       shell: bash
     - name: Setup Ruby
-      uses: ruby/setup-ruby@v1.180.1
+      uses: ruby/setup-ruby@v1.267.0
       with:
-        ruby-version: "3.2" # Not needed with a .ruby-version file
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-        cache-version: 0 # Increment this number if you need to re-download cached gems
+        ruby-version: "3.4.7" # Not needed with a .ruby-version file
+        bundler-cache: false # runs 'bundle install' and caches installed gems automatically
+        #cache-version: 0 # Increment this number if you need to re-download cached gems
         working-directory: "./docs"
     - name: Setup Pages
       id: pages
@@ -30,7 +30,7 @@ runs:
       working-directory: ./docs
       # Outputs to the './_site' directory by default
       shell: bash
-      run: make build BASE_URL="${{ steps.pages.outputs.base_path }}" VERSION="${{ inputs.version }}"
+      run: make build-ci BASE_URL=${{ steps.pages.outputs.base_path }} VERSION=${{ inputs.version }}
       #run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
       env:
         JEKYLL_ENV: production
@@ -40,3 +40,13 @@ runs:
       with:
         path: "docs/_site/"
         name: jekyll-docs-${{ inputs.version }}
+
+    - name: tar schema
+      run: tar -cvf artifact.tar src/cloudeventjekylldocs/output/schemas
+      shell: bash
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        path: "artifact.tar"
+        name: schemas-${{ inputs.version }}

.github/actions/acceptance-tests/action.yaml

@@ -14,17 +14,21 @@ runs:
         node-version: 18
 
     - name: Make Config
-      working-directory: ./schemas
+      working-directory: ./src/cloudeventjekylldocs
       shell: bash
       run: make config
 
     - name: Make Build
-      working-directory: ./schemas
+      working-directory: ./src/cloudeventjekylldocs
       shell: bash
       run: make build
 
+    - name: tar schema
+      run: tar -cvf artifact.tar src/cloudeventjekylldocs/output/schemas"
+      shell: bash
+
     - name: Upload artifact
-      uses: actions/upload-pages-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        path: "schemas/output/"
+        path: "artifact.tar"
         name: schemas-${{ inputs.version }}

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

@@ -0,0 +1,3 @@
+[
+  "integration"
+]