Merge branch 'develop' into dependabot/pip/pip-6510ebb17b

Author: mattdean3-nhs

.github/workflows/activate-stack.yml

@@ -42,6 +42,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/persistent-environment.yml

@@ -40,6 +40,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Install zip
         run: sudo apt-get install zip
@@ -107,6 +109,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -185,6 +189,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Download build artifacts
         uses: actions/download-artifact@v4
@@ -232,8 +238,16 @@ jobs:
       - name: Terraform Apply
         run: terraform -chdir=terraform/infrastructure apply tfplan
 
+      - name: Update environment config version
+        run: |
+          deployed_version=$(terraform -chdir=terraform/infrastructure output --raw version)
+          poetry run python ./scripts/set_env_config.py inactive-version ${deployed_version} ${{ inputs.environment }}
+
       - name: Smoke Test
-        run: make ENV=${{ inputs.environment }} test-smoke-internal
+        run: |
+          account=$(echo '${{ inputs.environment }}' | cut -d '-' -f1)
+          make ENV=${account} truststore-pull-client
+          make ENV=${{ inputs.environment }} test-smoke-internal
 
   activate-stack:
     name: Activate - ${{ inputs.environment }}
@@ -257,6 +271,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -300,6 +316,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -318,12 +336,12 @@ jobs:
 
       - name: "Smoke Test"
         run: |
-          make ENV=${{ inputs.environment }} test-smoke-external
+          make ENV=${{ inputs.environment }} test-smoke-public
 
   rollback-stack:
     name: Rollback - ${{ inputs.environment }}
     needs: [post-release-verify]
-    if: ${{ needs.post-release-verify.result == 'failure' }}
+    if: always() && ( needs.post-release-verify.result == 'failure' )
     runs-on: [self-hosted, ci]
     environment: ${{ inputs.environment }}
 
@@ -343,6 +361,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4

.github/workflows/pr-env-deploy.yml

@@ -60,6 +60,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Install zip
         run: sudo apt-get install zip
@@ -137,6 +139,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -233,6 +237,8 @@ jobs:
 
       - name: Install asdf and tools
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Python Dependency Install
         run: poetry install --no-root
@@ -280,6 +286,8 @@ jobs:
 
       - name: Install asdf and tools
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Setup Python environment
         run: |

.github/workflows/rollback-stack.yml

@@ -37,6 +37,8 @@ jobs:
 
       - name: Install asdf
         uses: asdf-vm/actions/[email protected]
+        with:
+          asdf_branch: v0.13.1
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -64,4 +66,4 @@ jobs:
 
       - name: "Smoke Test"
         run: |
-          make ENV=${{ inputs.environment }} test-smoke-external
+          make ENV=${{ inputs.environment }} test-smoke-public