Skip to content

Commit 197af08

Browse files
committed
Merge branch 'aea-6254-cdk-api-gateway' into aea-6256-cdk-statemachine
2 parents db95a9f + 0ac46b1 commit 197af08

12 files changed

Lines changed: 817 additions & 758 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
"timonwong.shellcheck",
3535
"github.vscode-github-actions",
3636
"dbaeumer.vscode-eslint",
37-
"vitest.explorer"
37+
"vitest.explorer",
38+
"sonarsource.sonarlint-vscode"
3839
],
3940
"settings": {
4041
"cSpell.words": [

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
2828
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
2929
get_config_values:
30-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
3131
with:
3232
verify_published_from_main_image: true
3333
quality_checks:
34-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
34+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
3535
needs: [get_config_values, get_commit_id]
3636
with:
3737
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -42,7 +42,7 @@ jobs:
4242

4343
tag_release:
4444
needs: [quality_checks, get_commit_id, get_config_values]
45-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
4646
with:
4747
dry_run: true
4848
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

.github/workflows/pull_request.yml

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

1010
jobs:
1111
get_config_values:
12-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
12+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
1313
with:
1414
verify_published_from_main_image: false
1515
dependabot-auto-approve-and-merge:
1616
needs: quality_checks
17-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
17+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
1818
secrets:
1919
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
2020
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
2121
pr_title_format_check:
22-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
22+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
2323
quality_checks:
24-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
24+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
2525
needs: [get_config_values, get_commit_id]
2626
with:
2727
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -104,7 +104,7 @@ jobs:
104104

105105
tag_release:
106106
needs: [get_commit_id, get_config_values]
107-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
107+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
108108
with:
109109
dry_run: true
110110
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

.github/workflows/release.yml

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

1111
jobs:
1212
get_config_values:
13-
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
1414
with:
1515
verify_published_from_main_image: true
1616
get_commit_id:
@@ -32,7 +32,7 @@ jobs:
3232
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
3333
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
3434
quality_checks:
35-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
3636
needs: [get_config_values, get_commit_id]
3737
with:
3838
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
@@ -43,7 +43,7 @@ jobs:
4343

4444
tag_release:
4545
needs: [quality_checks, get_commit_id, get_config_values]
46-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@383f3f9eaf3cb553ebcd74897bfed4d5e387629e
46+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@3ce609c510fc4cf1e8cda1a8b59eb937ff57c79d
4747
with:
4848
dry_run: false
4949
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

0 commit comments

Comments
 (0)