fix asdf install

Author: anthony-nhs

.github/workflows/run_regression_tests.yml

@@ -40,25 +40,30 @@ jobs:
           owner: "NHSDigital"
           repositories: "electronic-prescription-service-api-regression-tests"
 
+      # using git commit sha for version of action to ensure we have stable version
+      - name: Get asdf version
+        id: asdf-version
+        run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
+
       # using git commit sha for version of action to ensure we have stable version
       - name: Install asdf
         uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
         with:
-          asdf_branch: v0.11.3
+          asdf_version: ${{ steps.asdf-version.outputs.version }}
 
       - name: Cache asdf
         uses: actions/cache@v4
         with:
           path: |
             ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
+          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
           restore-keys: |
-            ${{ runner.os }}-asdf-
+            ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
 
       - name: Install asdf dependencies in .tool-versions
         uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
         with:
-          asdf_branch: v0.11.3
+          asdf_version: ${{ steps.asdf-version.outputs.version }}
         env:
           PYTHON_CONFIGURE_OPTS: --enable-shared
 
@@ -69,23 +74,23 @@ jobs:
           VERSION_NUMBER: ${{ inputs.VERSION_NUMBER }}
           GITHUB-TOKEN: ${{ steps.generate-token.outputs.token }}
         run: |
-              if [[ "$TARGET_ENVIRONMENT" != "prod" && "$TARGET_ENVIRONMENT" != "ref" ]]; then
-                # this should be the tag of the tests you want to run
-                REGRESSION_TEST_REPO_TAG=v3.3.1
+          if [[ "$TARGET_ENVIRONMENT" != "prod" && "$TARGET_ENVIRONMENT" != "ref" ]]; then
+            # this should be the tag of the tests you want to run
+            REGRESSION_TEST_REPO_TAG=v3.3.1
 
-                # this should be the tag of the regression test workflow you want to run
-                # This will normally be the same as REGRESSION_TEST_REPO_TAG
-                REGRESSION_TEST_WORKFLOW_TAG=v3.3.1
+            # this should be the tag of the regression test workflow you want to run
+            # This will normally be the same as REGRESSION_TEST_REPO_TAG
+            REGRESSION_TEST_WORKFLOW_TAG=v3.3.1
 
-                curl https://raw.githubusercontent.com/NHSDigital/electronic-prescription-service-api-regression-tests/refs/tags/${REGRESSION_TEST_WORKFLOW_TAG}/scripts/run_regression_tests.py -o run_regression_tests.py
-                poetry install
-                echo Running regression tests in the "$TARGET_ENVIRONMENT" environment
-                poetry run python -u run_regression_tests.py \
-                --env="$TARGET_ENVIRONMENT" \
-                --pr_label="$VERSION_NUMBER" \
-                --token=${{ steps.generate-token.outputs.token }} \
-                --is_called_from_github=true \
-                --product ${{ inputs.REGRESSION_TEST_PRODUCT }} \
-                --regression_test_repo_tag "${REGRESSION_TEST_REPO_TAG}" \
-                --regression_test_workflow_tag "${REGRESSION_TEST_WORKFLOW_TAG}"
-              fi
+            curl https://raw.githubusercontent.com/NHSDigital/electronic-prescription-service-api-regression-tests/refs/tags/${REGRESSION_TEST_WORKFLOW_TAG}/scripts/run_regression_tests.py -o run_regression_tests.py
+            poetry install
+            echo Running regression tests in the "$TARGET_ENVIRONMENT" environment
+            poetry run python -u run_regression_tests.py \
+            --env="$TARGET_ENVIRONMENT" \
+            --pr_label="$VERSION_NUMBER" \
+            --token=${{ steps.generate-token.outputs.token }} \
+            --is_called_from_github=true \
+            --product ${{ inputs.REGRESSION_TEST_PRODUCT }} \
+            --regression_test_repo_tag "${REGRESSION_TEST_REPO_TAG}" \
+            --regression_test_workflow_tag "${REGRESSION_TEST_WORKFLOW_TAG}"
+          fi

.github/workflows/sam_package_code.yml

@@ -16,35 +16,40 @@ jobs:
         with:
           ref: ${{ env.BRANCH_NAME }}
 
+      # using git commit sha for version of action to ensure we have stable version
+      - name: Get asdf version
+        id: asdf-version
+        run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
+
       # using git commit sha for version of action to ensure we have stable version
       - name: Install asdf
         uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
         with:
-          asdf_branch: v0.11.3
-  
+          asdf_version: ${{ steps.asdf-version.outputs.version }}
+
       - name: Cache asdf
         uses: actions/cache@v4
         with:
           path: |
             ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
+          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
           restore-keys: |
-            ${{ runner.os }}-asdf-
+            ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
 
       - name: Install asdf dependencies in .tool-versions
         uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
         with:
-          asdf_branch: v0.11.3
+          asdf_version: ${{ steps.asdf-version.outputs.version }}
         env:
           PYTHON_CONFIGURE_OPTS: --enable-shared
-      
+
       - name: Setting up .npmrc
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
           echo "@NHSDigital:registry=https://npm.pkg.github.com" >> ~/.npmrc
-          
+
       - name: make install
         run: |
           make install
@@ -67,7 +72,7 @@ jobs:
             .aws-sam/build
             packages/getSecretLayer/lib/get-secrets-layer.zip 
             SAMtemplates/state_machines/GetMyPrescriptionsStateMachine.asl.json
-      
+
       - shell: bash
         name: package sandbox code
         run: |
@@ -77,7 +82,7 @@ jobs:
           make sam-build-sandbox
           cp Makefile .aws-sam/build/
           cp samconfig_package_and_deploy.toml .aws-sam/build/
-      
+
       - uses: actions/upload-artifact@v4
         name: upload sandbox build artifact
         with: