Skip to content

Commit d65d5ce

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/js-yaml-3.14.2
2 parents 8f938cc + 33c0973 commit d65d5ce

21 files changed

+884
-845
lines changed

.github/workflows/cdk_package_code.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
packages: read
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@v5
25+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
2626
with:
2727
ref: ${{ env.BRANCH_NAME }}
2828

@@ -37,7 +37,7 @@ jobs:
3737
asdf_version: ${{ steps.asdf-version.outputs.version }}
3838

3939
- name: Cache asdf
40-
uses: actions/cache@v4
40+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
4141
with:
4242
path: |
4343
~/.asdf

.github/workflows/ci.yml

Lines changed: 10 additions & 7 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@v5
18+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
1919

2020
- name: Get asdf version
2121
id: asdf-version
@@ -28,13 +28,16 @@ jobs:
2828
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2929
3030
quality_checks:
31-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
31+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@a7daff06de7b695f601d9b1723ca184daca7d898
32+
needs: [get_asdf_version]
33+
with:
34+
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3235
secrets:
3336
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3437

3538
tag_release:
3639
needs: [quality_checks, get_asdf_version]
37-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
40+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@a7daff06de7b695f601d9b1723ca184daca7d898
3841
with:
3942
dry_run: true
4043
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -77,8 +80,8 @@ jobs:
7780
PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
7881
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
7982
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
80-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
81-
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
83+
SLACK_BOT_TOKEN: ${{ secrets.DEV_SLACK_BOT_TOKEN }}
84+
SLACK_SIGNING_SECRET: ${{ secrets.DEV_SLACK_SIGNING_SECRET }}
8285

8386
release_qa:
8487
needs: [tag_release, package_code, release_dev]
@@ -106,5 +109,5 @@ jobs:
106109
PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE: ${{ secrets.PROD_CLOUD_FORMATION_CHECK_VERSION_ROLE }}
107110
DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE: ${{ secrets.DEV_CLOUD_FORMATION_EXECUTE_LAMBDA_ROLE }}
108111
REGRESSION_TESTS_PEM: ${{ secrets.REGRESSION_TESTS_PEM }}
109-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
110-
SLACK_SIGNING_SECRET: ${{ secrets.SLACK_SIGNING_SECRET }}
112+
SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_BOT_TOKEN }}
113+
SLACK_SIGNING_SECRET: ${{ secrets.QA_SLACK_SIGNING_SECRET }}

.github/workflows/combine-dependabot-prs.yml

Lines changed: 0 additions & 151 deletions
This file was deleted.

.github/workflows/create_release_notes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
contents: write
4141
steps:
4242
- name: Checkout local github actions
43-
uses: actions/checkout@v5
43+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
4444
with:
4545
ref: ${{ env.BRANCH_NAME }}
4646
fetch-depth: 0

.github/workflows/delete_old_cloudformation_stacks.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
workflow_dispatch:
66
schedule:
77
- cron: "0 2,14 * * *"
8+
push:
9+
branches: [main]
810

911
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1012
jobs:
@@ -19,14 +21,14 @@ jobs:
1921
# Steps represent a sequence of tasks that will be executed as part of the job
2022
steps:
2123
- name: Checkout local github scripts
22-
uses: actions/checkout@v5
24+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
2325
with:
2426
ref: ${{ env.BRANCH_NAME }}
2527
sparse-checkout: |
2628
.github/scripts
2729
2830
- name: Configure AWS Credentials
29-
uses: aws-actions/configure-aws-credentials@v5
31+
uses: aws-actions/configure-aws-credentials@00943011d9042930efac3dcd3a170e4273319bc8
3032
with:
3133
aws-region: eu-west-2
3234
role-to-assume: ${{ secrets.DEV_CLOUD_FORMATION_DEPLOY_ROLE }}

.github/workflows/dependabot_auto_approve_and_merge.yml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/pr-link.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/pr_title_check.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)