Skip to content

Commit 061f99a

Browse files
committed
Merge branch 'main' of https://github.com/NHSDigital/eps-assist-me into dependabot/pip/cfn-lint-1.38.3
2 parents c1b4006 + e44077b commit 061f99a

File tree

7 files changed

+221
-271
lines changed

7 files changed

+221
-271
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99

1010
jobs:
1111
quality_checks:
12-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5
12+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.0
1313
secrets:
1414
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
1515

@@ -37,7 +37,7 @@ jobs:
3737

3838
# using git commit sha for version of action to ensure we have stable version
3939
- name: Install asdf
40-
uses: asdf-vm/actions/setup@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
40+
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
4141
with:
4242
asdf_branch: v0.14.1
4343

@@ -51,7 +51,7 @@ jobs:
5151
${{ runner.os }}-asdf-
5252
5353
- name: Install asdf dependencies in .tool-versions
54-
uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
54+
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
5555
with:
5656
asdf_branch: v0.14.1
5757
env:

.github/workflows/pr-link.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Comment on PR with link to JIRA ticket
3838
if: contains(github.event.pull_request.head.ref, 'aea-') || contains(github.event.pull_request.head.ref, 'AEA-') || contains(github.event.pull_request.head.ref, 'apm-') || contains(github.event.pull_request.head.ref, 'APM-') || contains(github.event.pull_request.head.ref, 'apmspii-') || contains(github.event.pull_request.head.ref, 'APMSPII-') || contains(github.event.pull_request.head.ref, 'adz-') || contains(github.event.pull_request.head.ref, 'ADZ-') || contains(github.event.pull_request.head.ref, 'amb-') || contains(github.event.pull_request.head.ref, 'AMB-')
3939
continue-on-error: true
40-
uses: unsplash/comment-on-pr@master
40+
uses: unsplash/comment-on-pr@b5610c6125a7197eaec80072ea35ef53e1fc6035
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4343
with:

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99

1010
jobs:
1111
quality_checks:
12-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5
12+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.0
1313
secrets:
1414
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
1515

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88

99
jobs:
1010
quality_checks:
11-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.0.5
11+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v4.1.0
1212
secrets:
1313
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
1414

@@ -36,7 +36,7 @@ jobs:
3636

3737
# using git commit sha for version of action to ensure we have stable version
3838
- name: Install asdf
39-
uses: asdf-vm/actions/setup@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
39+
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
4040
with:
4141
asdf_branch: v0.14.1
4242

@@ -50,7 +50,7 @@ jobs:
5050
${{ runner.os }}-asdf-
5151
5252
- name: Install asdf dependencies in .tool-versions
53-
uses: asdf-vm/actions/install@05e0d2ed97b598bfce82fd30daf324ae0c4570e6
53+
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
5454
with:
5555
asdf_branch: v0.14.1
5656
env:

packages/cdk/nagSuppressions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable max-len, @typescript-eslint/no-unused-vars */
1+
/* eslint-disable @typescript-eslint/no-unused-vars */
22
import {Stack} from "aws-cdk-lib"
33
import {NagPackSuppression, NagSuppressions} from "cdk-nag"
44

0 commit comments

Comments
 (0)