Skip to content

Commit bf2aea0

Browse files
committed
Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/aws-cdk-lib-2.227.0
2 parents 3d8e08d + 69be65e commit bf2aea0

File tree

28 files changed

+750
-1363
lines changed

28 files changed

+750
-1363
lines changed

.gitallowed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ packages\/auth_demo\/src\/App.tsx:150
2424
packages/common/authFunctions/src/cis2\.ts:.*decodeToken
2525
const token = jwt.decode(bearer_token, {complete: true})
2626
packages\/trackerUserInfoLambda\/src\/handler.ts:69
27+
poetry\.lock

.github/workflows/cdk_package_code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
asdf_version: ${{ steps.asdf-version.outputs.version }}
3636

3737
- name: Cache asdf
38-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
38+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
3939
with:
4040
path: |
4141
~/.asdf

.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@41e3450a9869f278be0e431a4b47b5c77bd55559
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
53+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
123+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
153+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
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@41e3450a9869f278be0e431a4b47b5c77bd55559
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@86a580e5eb38584c877ccfba5fc6f3f071faeffe
4848
with:
4949
dry_run: false
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/run_regression_tests.yml

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

3333
- name: Generate a token to authenticate regression testing
3434
id: generate-token
35-
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94
35+
uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf
3636
with:
3737
app-id: ${{ vars.REGRESSION_TESTS_APP_ID }}
3838
private-key: ${{ secrets.REGRESSION_TESTS_PEM }}
@@ -50,7 +50,7 @@ jobs:
5050
asdf_version: ${{ steps.asdf-version.outputs.version }}
5151

5252
- name: Cache asdf
53-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
53+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb
5454
with:
5555
path: |
5656
~/.asdf

0 commit comments

Comments
 (0)