From 80d821fb422af3b2b16df68e6d49964c18a91168 Mon Sep 17 00:00:00 2001 From: chrisbloe Date: Thu, 19 Feb 2026 11:27:52 +0000 Subject: [PATCH 1/2] [PRM-716] Only run Styep Function deploy once per merge --- .github/workflows/automated-deploy-services-dev.yml | 12 ++++++++++++ .github/workflows/deploy-service-dev.yml | 1 + 2 files changed, 13 insertions(+) diff --git a/.github/workflows/automated-deploy-services-dev.yml b/.github/workflows/automated-deploy-services-dev.yml index 9709a5b..2c8e8bc 100644 --- a/.github/workflows/automated-deploy-services-dev.yml +++ b/.github/workflows/automated-deploy-services-dev.yml @@ -89,3 +89,15 @@ jobs: is_deployment: ${{ github.ref == 'refs/heads/main' }} service_name: transfer-classifier secrets: inherit + + redeploy_step_functions_on_infra: + name: Redeploy step functions on infrastructure + needs: [metrics-calculator, ods-downloader, reports-generator, transfer-classifier] + if: always() && (needs.metrics-calculator.result == 'success' || needs.ods-downloader.result == 'success' || needs.reports-generator.result == 'success' needs.transfer-classifier.result == 'success') && (needs.metrics-calculator.result == 'success' || needs.metrics-calculator.result == 'skipped') && (needs.ods-downloader.result == 'success' || needs.ods-downloader.result == 'skipped') && (needs.reports-generator.result == 'success' || needs.reports-generator.result == 'skipped') && (needs.transfer-classifier.result == 'success' || needs.transfer-classifier.result == 'skipped') + uses: NHSDigital/gp2gp-reporting-infrastructure/.github/workflows/deploy-stack.yml@v4 + with: + environment: dev + is_deployment: ${{ github.ref == 'refs/heads/main' }} + terraform_stack: step_function + hyphenated_alias: step-function + secrets: inherit diff --git a/.github/workflows/deploy-service-dev.yml b/.github/workflows/deploy-service-dev.yml index 70ff3b9..22f7bef 100644 --- a/.github/workflows/deploy-service-dev.yml +++ b/.github/workflows/deploy-service-dev.yml @@ -156,6 +156,7 @@ jobs: name: Redeploy step functions on infrastructure needs: [redeploy_image_on_infra] uses: NHSDigital/gp2gp-reporting-infrastructure/.github/workflows/deploy-stack.yml@v4 + if: github.event_name == 'workflow_dispatch' with: environment: dev is_deployment: ${{ inputs.is_deployment }} From 1ea5269f34e072d6730ecb197e0f738ac70882b2 Mon Sep 17 00:00:00 2001 From: chrisbloe Date: Thu, 19 Feb 2026 11:29:12 +0000 Subject: [PATCH 2/2] Update packages on Docker image --- dashboard/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile index e673a89..295f7e7 100644 --- a/dashboard/Dockerfile +++ b/dashboard/Dockerfile @@ -1,5 +1,9 @@ FROM node:24-trixie-slim +# Update the package list and upgrade all installed system packages +RUN apt-get update && apt-get upgrade -y && \ + rm -rf /var/lib/apt/lists/* + # Copy only required files for building and deploying pipeline COPY analytics-config.json /tmp/analytics-config.json COPY custom.d.ts /tmp/custom.d.ts