Skip to content

Commit 97657a0

Browse files
bencegadanyi1-nhsbencegadanyi1-nhs
authored
Merge branch 'main' into dependabot/npm_and_yarn/aws-cdk-lib-2.227.0
2 parents 649eccc + 0aecfeb commit 97657a0

File tree

13 files changed

+153
-87
lines changed

13 files changed

+153
-87
lines changed

‎.github/workflows/cdk_package_code.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
packages: read
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
25+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2626
with:
2727
ref: ${{ env.BRANCH_NAME }}
2828

@@ -32,7 +32,7 @@ jobs:
3232

3333
# using git commit sha for version of action to ensure we have stable version
3434
- name: Install asdf
35-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
35+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
3636
with:
3737
asdf_version: ${{ steps.asdf-version.outputs.version }}
3838

@@ -46,7 +46,7 @@ jobs:
4646
${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
4747
4848
- name: Install asdf dependencies in .tool-versions
49-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
49+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
5050
with:
5151
asdf_version: ${{ steps.asdf-version.outputs.version }}
5252
env:

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
18+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
1919

2020
- name: Get asdf version
2121
id: asdf-version
@@ -37,7 +37,7 @@ jobs:
3737

3838
tag_release:
3939
needs: [quality_checks, get_asdf_version]
40-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
40+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
4141
with:
4242
dry_run: true
4343
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/create_release_notes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
contents: write
4141
steps:
4242
- name: Checkout local github actions
43-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
43+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
4444
with:
4545
ref: ${{ env.BRANCH_NAME }}
4646
fetch-depth: 0

‎.github/workflows/delete_old_cloudformation_stacks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
# Steps represent a sequence of tasks that will be executed as part of the job
2222
steps:
2323
- name: Checkout local github scripts
24-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2525
with:
2626
ref: ${{ env.BRANCH_NAME }}
2727
sparse-checkout: |

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2525

2626
- name: Get asdf version
2727
id: asdf-version

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
22+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2323

2424
- name: Get asdf version
2525
id: asdf-version
@@ -41,7 +41,7 @@ jobs:
4141

4242
tag_release:
4343
needs: [quality_checks, get_asdf_version]
44-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
44+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
4545
with:
4646
dry_run: false
4747
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/release_all_stacks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
contents: write
7676
steps:
7777
- name: Checkout local github actions
78-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
78+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
7979
with:
8080
ref: ${{ env.BRANCH_NAME }}
8181
fetch-depth: 0
@@ -220,7 +220,7 @@ jobs:
220220
steps:
221221
- name: Checkout gh-pages
222222
if: ${{ inputs.IS_PULL_REQUEST == false }}
223-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
223+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
224224
with:
225225
ref: gh-pages
226226
path: gh-pages

‎.github/workflows/run_regression_tests.yml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout local github actions
28-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
28+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
2929
with:
3030
ref: ${{ env.BRANCH_NAME }}
3131
fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
4545

4646
# using git commit sha for version of action to ensure we have stable version
4747
- name: Install asdf
48-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
48+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
4949
with:
5050
asdf_version: ${{ steps.asdf-version.outputs.version }}
5151

@@ -54,12 +54,12 @@ jobs:
5454
with:
5555
path: |
5656
~/.asdf
57-
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
57+
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
5858
restore-keys: |
59-
${{ runner.os }}-asdf-
59+
${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
6060
6161
- name: Install asdf dependencies in .tool-versions
62-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
62+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
6363
with:
6464
asdf_version: ${{ steps.asdf-version.outputs.version }}
6565
env:
@@ -73,14 +73,28 @@ jobs:
7373
GITHUB-TOKEN: ${{ steps.generate-token.outputs.token }}
7474
run: |
7575
if [[ "$TARGET_ENVIRONMENT" != "prod" && "$TARGET_ENVIRONMENT" != "ref" ]]; then
76-
# this should be the tag of the tests you want to run
77-
REGRESSION_TEST_REPO_TAG=v3.4.26
76+
REGRESSION_TEST_REPO_TAG="v3.5.0" # This is the tag or branch of the regression test code to run, usually a version tag like v3.1.0 or a branch name
77+
REGRESSION_TEST_WORKFLOW_TAG="v3.5.0" # This is the tag of the github workflow to run, usually the same as REGRESSION_TEST_REPO_TAG
7878
79-
# this should be the tag of the regression test workflow you want to run
80-
# This will normally be the same as REGRESSION_TEST_REPO_TAG
81-
REGRESSION_TEST_WORKFLOW_TAG=v3.4.26
79+
if [[ -z "$REGRESSION_TEST_REPO_TAG" || -z "$REGRESSION_TEST_WORKFLOW_TAG" ]]; then
80+
echo "Error: One or both tag variables are not set" >&2
81+
exit 1
82+
fi
83+
84+
# HELPER IF STATEMENT - It will automatically determine the correct Git URL to use based on the REGRESSION_TEST_WORKFLOW_TAG value
85+
if [[ "$REGRESSION_TEST_WORKFLOW_TAG" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
86+
echo "REGRESSION_TEST_WORKFLOW_TAG is a version tag, using tag link"
87+
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
88+
else
89+
echo "REGRESSION_TEST_WORKFLOW_TAG doesn't look like a version tag, using branch link"
90+
curl "https://raw.githubusercontent.com/NHSDigital/electronic-prescription-service-api-regression-tests/refs/heads/${REGRESSION_TEST_REPO_TAG}/scripts/run_regression_tests.py" -o run_regression_tests.py
91+
fi
92+
93+
if [[ ! -f run_regression_tests.py ]]; then
94+
echo "Error: run_regression_tests.py not found" >&2
95+
exit 1
96+
fi
8297
83-
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
8498
poetry install
8599
echo Running regression tests in the "$TARGET_ENVIRONMENT" environment
86100
poetry run python -u run_regression_tests.py \

0 commit comments

Comments
 (0)