Skip to content

Commit 581589b

Browse files
anthony-nhsanthony-nhs
authored
Merge branch 'main' into dependabot/pip/pre-commit-4.5.1
2 parents 0108e79 + f78392c commit 581589b

File tree

20 files changed

+1273
-1690
lines changed

20 files changed

+1273
-1690
lines changed

‎.github/workflows/cdk_package_code.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
Makefile \
6868
cdk.json
6969
70-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4
70+
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
7171
name: upload build artifact
7272
with:
7373
name: build_artifact

‎.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 }}
@@ -50,7 +50,7 @@ jobs:
5050
quality_checks:
5151
# always run, but only block in the non-skip case
5252
needs: [get_commit_message, get_asdf_version]
53-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
53+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
5454
with:
5555
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
5656
secrets:
@@ -120,7 +120,7 @@ jobs:
120120
run: echo "Skipping QC gate per commit message."
121121

122122
pr_title_format_check:
123-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
123+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
124124

125125
get_issue_number:
126126
runs-on: ubuntu-22.04
@@ -150,7 +150,7 @@ jobs:
150150

151151
tag_release:
152152
needs: [get_asdf_version]
153-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
153+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@2b3ddfd1e59daf9905522d0140c6cd08e2547432
154154
with:
155155
dry_run: true
156156
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/config/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/release_all_stacks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
role-to-assume: ${{ secrets.CDK_PULL_IMAGE_ROLE }}
129129
role-session-name: prescription-clinical-tracker-ui-pull-image
130130
- name: build_artifact download
131-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53
131+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131
132132
with:
133133
name: build_artifact
134134

‎package-lock.json‎

Lines changed: 1229 additions & 1646 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"@eslint/js": "^9.38.0",
4444
"@jest/globals": "^30.1.1",
4545
"@types/jest": "^30.0.0",
46-
"@types/node": "^25.0.1",
46+
"@types/node": "^25.0.3",
4747
"@typescript-eslint/eslint-plugin": "^8.48.0",
48-
"@typescript-eslint/parser": "^8.47.0",
48+
"@typescript-eslint/parser": "^8.50.0",
4949
"aws-sdk-client-mock": "^4.1.0",
50-
"eslint": "^9.39.1",
50+
"eslint": "^9.39.2",
5151
"eslint-config-prettier": "^10.1.8",
5252
"eslint-plugin-import-newlines": "^1.3.4",
5353
"eslint-plugin-prettier": "^5.5.4",
@@ -60,10 +60,10 @@
6060
"ts-jest": "^29.4.6",
6161
"ts-node": "^10.9.2",
6262
"typescript": "^5.9.3",
63-
"typescript-eslint": "^8.49.0"
63+
"typescript-eslint": "^8.50.0"
6464
},
6565
"dependencies": {
6666
"conventional-changelog-eslint": "^6.0.0",
67-
"esbuild": "^0.27.1"
67+
"esbuild": "^0.27.2"
6868
}
6969
}

‎packages/CIS2SignOutLambda/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"dependencies": {
1616
"@aws-lambda-powertools/logger": "^2.30.0",
17-
"@aws-sdk/client-dynamodb": "^3.948.0",
18-
"@aws-sdk/lib-dynamodb": "^3.948.0",
17+
"@aws-sdk/client-dynamodb": "^3.956.0",
18+
"@aws-sdk/lib-dynamodb": "^3.955.0",
1919
"@cpt-ui-common/authFunctions": "^1.0.0",
2020
"@cpt-ui-common/dynamoFunctions": "^1.0.0",
2121
"@cpt-ui-common/middyErrorHandler": "^1.0.0",

‎packages/cdk/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"check-licenses": "license-checker --failOn GPL --failOn LGPL --start ../.."
88
},
99
"dependencies": {
10-
"aws-cdk-lib": "^2.227.0",
10+
"aws-cdk-lib": "^2.233.0",
1111
"cdk-nag": "^2.37.55",
1212
"constructs": "^10.4.4"
1313
},
1414
"devDependencies": {
15-
"aws-cdk": "^2.1034.0"
15+
"aws-cdk": "^2.1100.1"
1616
}
1717
}

‎packages/cognito/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"dependencies": {
1616
"@aws-lambda-powertools/logger": "^2.30.0",
1717
"@aws-lambda-powertools/parameters": "^2.29.0",
18-
"@aws-sdk/client-dynamodb": "^3.948.0",
19-
"@aws-sdk/lib-dynamodb": "^3.948.0",
18+
"@aws-sdk/client-dynamodb": "^3.956.0",
19+
"@aws-sdk/lib-dynamodb": "^3.955.0",
2020
"@cpt-ui-common/authFunctions": "^1.0.0",
2121
"@cpt-ui-common/dynamoFunctions": "^1.0.0",
2222
"@cpt-ui-common/lambdaUtils": "^1.0.0",

0 commit comments

Comments
 (0)