Skip to content

Commit 20ad226

Browse files
authored
Merge branch 'main' into dependabot/pip/pip-licenses-5.5.1
2 parents b2f41f4 + b2eb2f6 commit 20ad226

8 files changed

Lines changed: 109 additions & 125 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
tag_release:
5757
needs: [quality_checks, get_commit_id, get_asdf_version]
58-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
58+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
5959
with:
6060
dry_run: true
6161
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/package_npm_code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
asdf_version: ${{ needs.get_asdf_version.outputs.asdf_version }}
3838

3939
- name: Cache asdf
40-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
40+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306
4141
with:
4242
path: |
4343
~/.asdf

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 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@27a44fb54f4023136d2c14058e3256e73af9901e
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -32,7 +32,7 @@ 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@27a44fb54f4023136d2c14058e3256e73af9901e
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
3636
quality_checks:
3737
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
3838
needs: [get_asdf_version, get_commit_id]
@@ -112,7 +112,7 @@ jobs:
112112

113113
tag_release:
114114
needs: [get_commit_id, get_asdf_version]
115-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
115+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
116116
with:
117117
dry_run: true
118118
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
tag_release:
5858
needs: [quality_checks, get_commit_id, get_asdf_version]
59-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@b933ef1bb3527fd7e7d5a7629fbd4e4dd94bf1b4
59+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@e31e25273fb87450be4ef763ddbed4f531c45f8e
6060
with:
6161
dry_run: false
6262
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"keywords": [],
1212
"license": "MIT",
1313
"devDependencies": {
14-
"@types/node": "^25.0.10",
14+
"@types/node": "^25.1.0",
1515
"@typescript-eslint/eslint-plugin": "^8.54.0",
1616
"@typescript-eslint/parser": "^8.54.0",
1717
"@vitest/coverage-v8": "^4.0.18",
@@ -26,7 +26,7 @@
2626
"vitest": "^4.0.13"
2727
},
2828
"dependencies": {
29-
"aws-cdk": "^2.1102.0",
29+
"aws-cdk": "^2.1104.0",
3030
"aws-cdk-lib": "^2.236.0",
3131
"cdk-nag": "^2.37.52",
3232
"constructs": "^10.4.5",

packages/cdkConstructs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"private": false,
2121
"type": "module",
2222
"dependencies": {
23-
"@aws-sdk/client-cloudformation": "^3.975.0",
24-
"@aws-sdk/client-s3": "^3.975.0",
25-
"aws-cdk": "^2.1102.0",
23+
"@aws-sdk/client-cloudformation": "^3.978.0",
24+
"@aws-sdk/client-s3": "^3.978.0",
25+
"aws-cdk": "^2.1104.0",
2626
"aws-cdk-lib": "^2.236.0",
2727
"cdk-nag": "^2.37.52",
2828
"constructs": "^10.4.5"
@@ -37,6 +37,6 @@
3737
"main": "lib/src/index.js",
3838
"types": "lib/src/index.d.ts",
3939
"devDependencies": {
40-
"@types/node": "^25.0.10"
40+
"@types/node": "^25.1.0"
4141
}
4242
}

packages/deploymentUtils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"private": false,
2121
"type": "module",
2222
"dependencies": {
23-
"@aws-sdk/client-cloudformation": "^3.975.0",
24-
"@aws-sdk/client-lambda": "^3.975.0",
23+
"@aws-sdk/client-cloudformation": "^3.978.0",
24+
"@aws-sdk/client-lambda": "^3.978.0",
2525
"json-schema-to-ts": "^3.1.1"
2626
},
2727
"bugs": {

0 commit comments

Comments
 (0)