Merge pull request #504 from NHSDigital/master

MergeMasterToEdge

Author: NautiyalVikas1

.github/workflows/continuous-integration.yml

@@ -12,6 +12,9 @@ jobs:
     - name: Test Pull Request Deployments
       env:
         AZURE_TOKEN: "${{ secrets.AZURE_TOKEN }}"
+        AZ_CLIENT_ID: "${{ secrets.AZ_CLIENT_ID }}"
+        AZ_CLIENT_SECRET: "${{ secrets.AZ_CLIENT_SECRET }}"
+        AZ_CLIENT_TENANT: "${{ secrets.AZ_CLIENT_TENANT }}"
       run: |
         export BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
         export NOTIFY_COMMIT_SHA="${{ github.event.pull_request.head.sha }}"

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
               run: pip install poetry
 
             - name: Cache poetry packages
-              uses: actions/cache@v1
+              uses: actions/cache@v4
               id: cache
               with:
                 path: ~/.venv

azure/templates/deploy-service.yml

@@ -247,7 +247,6 @@ steps:
       export ANSIBLE_FORCE_COLOR=yes
       export DIST_DIR=$(SERVICE_DIR)
       export PULL_REQUEST="${{ parameters.pr_label }}"
-
       make --no-print-directory -C $(UTILS_DIR)/ansible deploy-manifest
     displayName: 'Deploy Manifest'