Skip to content

Commit 75b99da

Browse files
MatthewPopat-NHSMatthewPopat-NHS
committed
Merge remote-tracking branch 'origin/main' into AEA-6028
2 parents 547d5ed + f49719c commit 75b99da

12 files changed

Lines changed: 556 additions & 1171 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
19+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2020
with:
2121
ref: ${{ env.BRANCH_NAME }}
2222

@@ -33,7 +33,7 @@ jobs:
3333
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
3434
steps:
3535
- name: Checkout code
36-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
36+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
3737

3838
- name: Get asdf version
3939
id: asdf-version
@@ -44,7 +44,7 @@ jobs:
4444
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4545
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
4646
quality_checks:
47-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@3cba6a3733673bafc95526503478674332c26007
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
4848
needs: [get_asdf_version, get_commit_id]
4949
with:
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -53,7 +53,7 @@ jobs:
5353

5454
tag_release:
5555
needs: [quality_checks, get_commit_id, get_asdf_version]
56-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
56+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
5757
with:
5858
dry_run: true
5959
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/docker_image_build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
packages: read
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
22+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2323
with:
2424
ref: ${{ env.BRANCH_NAME }}
2525

@@ -31,7 +31,7 @@ jobs:
3131
docker build -t "cdk-utils-build:${VERSION_NUMBER}" -f docker/Dockerfile --build-arg VERSION="${VERSION_NUMBER}" .
3232
docker save "cdk-utils-build:${VERSION_NUMBER}" -o cdk-utils-build.img
3333
34-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
34+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
3535
name: Upload docker images
3636
with:
3737
name: docker_artifact

‎.github/workflows/docker_image_upload.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,22 @@ jobs:
3232

3333
steps:
3434
- name: Checkout local github actions
35-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
35+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
3636
with:
3737
ref: ${{ env.BRANCH_NAME }}
3838
fetch-depth: 0
3939
sparse-checkout: |
4040
.github
4141
4242
- name: Configure AWS Credentials
43-
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8
43+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
4444
with:
4545
aws-region: eu-west-2
4646
role-to-assume: ${{ secrets.CDK_PUSH_IMAGE_ROLE }}
4747
role-session-name: upload-cdk-utils-build
4848

4949
- name: docker_artifact download
50-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
50+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
5151
with:
5252
name: docker_artifact
5353
path: .

‎.github/workflows/package_npm_code.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
14+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
1515

1616
- name: Get asdf version
1717
id: asdf-version
@@ -26,7 +26,7 @@ jobs:
2626
needs: [get_asdf_version]
2727
steps:
2828
- name: Checkout code
29-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
29+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
3030
with:
3131
ref: ${{ env.BRANCH_NAME }}
3232

@@ -37,7 +37,7 @@ jobs:
3737
asdf_version: ${{ needs.get_asdf_version.outputs.asdf_version }}
3838

3939
- name: Cache asdf
40-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
40+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
4141
with:
4242
path: |
4343
~/.asdf
@@ -60,7 +60,7 @@ jobs:
6060
run: |
6161
make package
6262
63-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
63+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
6464
name: Upload packaged code
6565
with:
6666
name: nhsdigital-eps-cdk-constructs-1.0.0.tgz

‎.github/workflows/pull_request.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
jobs:
1111
dependabot-auto-approve-and-merge:
1212
needs: quality_checks
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@3cba6a3733673bafc95526503478674332c26007
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -21,7 +21,7 @@ jobs:
2121
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
24+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2525

2626
- name: Get asdf version
2727
id: asdf-version
@@ -32,9 +32,9 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
pr_title_format_check:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@3cba6a3733673bafc95526503478674332c26007
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
3636
quality_checks:
37-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@3cba6a3733673bafc95526503478674332c26007
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
3838
needs: [get_asdf_version, get_commit_id]
3939
with:
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -74,7 +74,7 @@ jobs:
7474
sha_short: ${{ steps.commit_id.outputs.sha_short }}
7575
steps:
7676
- name: Checkout code
77-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
77+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
7878
with:
7979
ref: ${{ env.BRANCH_NAME }}
8080

@@ -109,7 +109,7 @@ jobs:
109109

110110
tag_release:
111111
needs: [get_commit_id, get_asdf_version]
112-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
112+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
113113
with:
114114
dry_run: true
115115
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
20+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2121
with:
2222
ref: ${{ env.BRANCH_NAME }}
2323

@@ -34,7 +34,7 @@ jobs:
3434
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
3535
steps:
3636
- name: Checkout code
37-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
37+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
3838

3939
- name: Get asdf version
4040
id: asdf-version
@@ -45,7 +45,7 @@ jobs:
4545
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4646
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
4747
quality_checks:
48-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@3cba6a3733673bafc95526503478674332c26007
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
4949
needs: [get_asdf_version, get_commit_id]
5050
with:
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -54,7 +54,7 @@ jobs:
5454

5555
tag_release:
5656
needs: [quality_checks, get_commit_id, get_asdf_version]
57-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@3cba6a3733673bafc95526503478674332c26007
57+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2fe6bc6cd974efb4d55a2a7b665385f7a2d28950
5858
with:
5959
dry_run: false
6060
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.tool-versions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
nodejs 24.11.1
2-
python 3.12.7
3-
poetry 1.8.3
1+
nodejs 24.12.0
2+
python 3.14.2
3+
poetry 2.2.1
44
shellcheck 0.10.0
55
actionlint 1.7.3

0 commit comments

Comments
 (0)