Skip to content

Commit b7066d0

Browse files
authored
Merge branch 'main' into dependabot/pip/cfn-lint-1.43.1
2 parents cd868ec + 39accea commit b7066d0

File tree

18 files changed

+1356
-900
lines changed

18 files changed

+1356
-900
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2828
2929
quality_checks:
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
3131
needs: [get_asdf_version]
3232
with:
3333
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -46,7 +46,7 @@ jobs:
4646
4747
tag_release:
4848
needs: [quality_checks, get_commit_id, get_asdf_version]
49-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/pull_request.yml

Lines changed: 4 additions & 4 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@86a580e5eb38584c877ccfba5fc6f3f071faeffe
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,15 +32,15 @@ jobs:
3232
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/settings.yml)
3333
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
3636
needs: [get_asdf_version]
3737
with:
3838
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3939
secrets:
4040
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4141

4242
pr_title_format_check:
43-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
43+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
4444

4545
get_issue_number:
4646
runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
7171

7272
tag_release:
7373
needs: [get_asdf_version]
74-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
74+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
7575
with:
7676
dry_run: true
7777
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/cfg/settings.yml)
2626
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2727
quality_checks:
28-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
2929
needs: [get_asdf_version]
3030
with:
3131
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -44,7 +44,7 @@ jobs:
4444
4545
tag_release:
4646
needs: [quality_checks, get_commit_id, get_asdf_version]
47-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
4848
with:
4949
dry_run: false
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/run_package_code_and_api.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
cp packages/specification/dist/eps-prescription-status-update-api.resolved.json .aws-sam/build/specification/
6969
cp packages/specification/dist/eps-custom-prescription-status-update-api.resolved.json .aws-sam/build/specification/
7070
71-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
71+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
7272
name: Upload build artifact
7373
with:
7474
name: packaged_code
@@ -92,7 +92,7 @@ jobs:
9292
cp packages/specification/dist/eps-custom-prescription-status-update-api.resolved.json .aws-sam/build/specification/
9393
9494
# Readme is included to stop the action flattening the folder structure of aws-sam/build when it is the only item to upload
95-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
95+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
9696
name: Upload sandbox build artifact
9797
with:
9898
name: packaged_sandbox_code

.github/workflows/run_release_code_and_api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
role-session-name: psu-release-code
174174

175175
- name: Download build artifact
176-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
176+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
177177
with:
178178
name: ${{ inputs.BUILD_ARTIFACT }}
179179
path: .

0 commit comments

Comments
 (0)