Skip to content

Commit 1035346

Browse files
jonathanwelch1-nhsjonathanwelch1-nhs
committed
fixed merge conflicts
2 parents dee7b42 + ec4942e commit 1035346

File tree

27 files changed

+90
-23204
lines changed

27 files changed

+90
-23204
lines changed

‎.github/workflows/cdk_package_code.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
packages: read
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
22+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2323
with:
2424
ref: ${{ env.BRANCH_NAME }}
2525

@@ -30,7 +30,7 @@ jobs:
3030

3131
# using git commit sha for version of action to ensure we have stable version
3232
- name: Install asdf
33-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
33+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
3434
with:
3535
asdf_version: ${{ steps.asdf-version.outputs.version }}
3636

@@ -44,7 +44,7 @@ jobs:
4444
${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
4545
4646
- name: Install asdf dependencies in .tool-versions
47-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
47+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
4848
with:
4949
asdf_version: ${{ steps.asdf-version.outputs.version }}
5050
env:

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
18+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
1919

2020
- name: Get asdf version
2121
id: asdf-version
@@ -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@a7daff06de7b695f601d9b1723ca184daca7d898
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
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@a7daff06de7b695f601d9b1723ca184daca7d898
49+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
5050
with:
5151
dry_run: true
5252
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/delete_old_cloudformation_stacks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
# Steps represent a sequence of tasks that will be executed as part of the job
2020
steps:
2121
- name: Checkout local github scripts
22-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
22+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2323
with:
2424
ref: ${{ env.BRANCH_NAME }}
2525
sparse-checkout: |
2626
.github/scripts
2727
2828
- name: Configure AWS Credentials
29-
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8
29+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
3030
with:
3131
aws-region: eu-west-2
3232
role-to-assume: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}

‎.github/workflows/pull_request.yml‎

Lines changed: 6 additions & 6 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@a7daff06de7b695f601d9b1723ca184daca7d898
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
1414
secrets:
1515
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1616
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
@@ -21,7 +21,7 @@ jobs:
2121
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
24+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2525

2626
- name: Get asdf version
2727
id: asdf-version
@@ -38,7 +38,7 @@ jobs:
3838
commit_message: ${{ steps.commit_message.outputs.commit_message }}
3939
steps:
4040
- name: Checkout code
41-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
41+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
4242
with:
4343
ref: ${{ env.BRANCH_NAME }}
4444
fetch-depth: 0
@@ -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@a7daff06de7b695f601d9b1723ca184daca7d898
53+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
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@a7daff06de7b695f601d9b1723ca184daca7d898
123+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
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@a7daff06de7b695f601d9b1723ca184daca7d898
153+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
154154
with:
155155
dry_run: true
156156
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
17+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
1818

1919
- name: Get asdf version
2020
id: asdf-version
@@ -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@a7daff06de7b695f601d9b1723ca184daca7d898
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
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@a7daff06de7b695f601d9b1723ca184daca7d898
47+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
4848
with:
4949
dry_run: false
5050
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

‎.github/workflows/release_all_stacks.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
contents: write
103103
steps:
104104
- name: Checkout local github actions
105-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
105+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
106106
with:
107107
ref: ${{ env.BRANCH_NAME }}
108108
fetch-depth: 0
@@ -122,7 +122,7 @@ jobs:
122122
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
123123
- name: Configure AWS Credentials
124124
id: connect_aws_pull_image
125-
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8
125+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
126126
with:
127127
aws-region: eu-west-2
128128
role-to-assume: ${{ secrets.CDK_PULL_IMAGE_ROLE }}
@@ -153,7 +153,7 @@ jobs:
153153
154154
- name: Configure AWS Credentials
155155
id: connect_aws_for_deployment
156-
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8
156+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
157157
with:
158158
aws-region: eu-west-2
159159
role-to-assume: ${{ secrets.CLOUD_FORMATION_DEPLOY_ROLE }}
@@ -588,7 +588,7 @@ jobs:
588588
steps:
589589
- name: Checkout gh-pages
590590
if: ${{ inputs.IS_PULL_REQUEST == false }}
591-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
591+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
592592
with:
593593
ref: gh-pages
594594
path: gh-pages

‎.github/workflows/run_regression_tests.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525

2626
steps:
2727
- name: Checkout local github actions
28-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
28+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2929
with:
3030
ref: ${{ env.BRANCH_NAME }}
3131
fetch-depth: 0
3232

3333
- name: Generate a token to authenticate regression testing
3434
id: generate-token
35-
uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42
35+
uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94
3636
with:
3737
app-id: ${{ vars.REGRESSION_TESTS_APP_ID }}
3838
private-key: ${{ secrets.REGRESSION_TESTS_PEM }}
@@ -45,7 +45,7 @@ jobs:
4545

4646
# using git commit sha for version of action to ensure we have stable version
4747
- name: Install asdf
48-
uses: asdf-vm/actions/setup@1902764435ca0dd2f3388eea723a4f92a4eb8302
48+
uses: asdf-vm/actions/setup@b7bcd026f18772e44fe1026d729e1611cc435d47
4949
with:
5050
asdf_version: ${{ steps.asdf-version.outputs.version }}
5151

@@ -59,7 +59,7 @@ jobs:
5959
${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}-${{ steps.asdf-version.outputs.version }}
6060
6161
- name: Install asdf dependencies in .tool-versions
62-
uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
62+
uses: asdf-vm/actions/install@b7bcd026f18772e44fe1026d729e1611cc435d47
6363
with:
6464
asdf_version: ${{ steps.asdf-version.outputs.version }}
6565
env:
@@ -73,8 +73,8 @@ jobs:
7373
GITHUB-TOKEN: ${{ steps.generate-token.outputs.token }}
7474
run: |
7575
if [[ "$TARGET_ENVIRONMENT" != "prod" && "$TARGET_ENVIRONMENT" != "ref" ]]; then
76-
REGRESSION_TEST_REPO_TAG="v3.4.35" # This is the tag or branch of the regression test code to run, usually a version tag like v3.1.0 or a branch name
77-
REGRESSION_TEST_WORKFLOW_TAG="v3.4.24" # This is the tag of the github workflow to run, usually the same as REGRESSION_TEST_REPO_TAG
76+
REGRESSION_TEST_REPO_TAG="v3.5.10" # This is the tag or branch of the regression test code to run, usually a version tag like v3.1.0 or a branch name
77+
REGRESSION_TEST_WORKFLOW_TAG="v3.5.10" # This is the tag of the github workflow to run, usually the same as REGRESSION_TEST_REPO_TAG
7878
7979
if [[ -z "$REGRESSION_TEST_REPO_TAG" || -z "$REGRESSION_TEST_WORKFLOW_TAG" ]]; then
8080
echo "Error: One or both tag variables are not set" >&2

0 commit comments

Comments
 (0)