Skip to content

Commit 7c85ef3

Browse files
committed
Merge branch 'main' of github.com-nhs:NHSDigital/prescriptionsforpatients
2 parents 60d7d77 + 51d749a commit 7c85ef3

File tree

20 files changed

+1095
-1479
lines changed

20 files changed

+1095
-1479
lines changed

.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@v5
18+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
1919

2020
- name: Get asdf version
2121
id: asdf-version
@@ -26,7 +26,7 @@ jobs:
2626
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
2727
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2828
quality_checks:
29-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v5.1.3
29+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
3030
needs: [get_asdf_version]
3131
with:
3232
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -45,7 +45,7 @@ jobs:
4545
4646
tag_release:
4747
needs: [quality_checks, get_commit_id, get_asdf_version]
48-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f3d071da30cd01dc0e4472ac0e2d7452db78d1c7
48+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
4949
with:
5050
dry_run: true
5151
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

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

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

.github/workflows/delete_old_cloudformation_stacks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
# Steps represent a sequence of tasks that will be executed as part of the job
2222
steps:
2323
- name: Checkout local github scripts
24-
uses: actions/checkout@v5
24+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
2525
with:
2626
ref: ${{ env.BRANCH_NAME }}
2727
sparse-checkout: |
2828
.github/scripts
2929
3030
- name: Configure AWS Credentials
31-
uses: aws-actions/configure-aws-credentials@v5
31+
uses: aws-actions/configure-aws-credentials@61815dcd50bd041e203e49132bacad1fd04d2708
3232
with:
3333
aws-region: eu-west-2
3434
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/pull_request.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,21 @@ env:
88
BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
99

1010
jobs:
11+
dependabot-auto-approve-and-merge:
12+
needs: quality_checks
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
14+
secrets:
15+
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
16+
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
17+
1118
get_asdf_version:
1219
runs-on: ubuntu-22.04
1320
outputs:
1421
asdf_version: ${{ steps.asdf-version.outputs.version }}
1522
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1623
steps:
1724
- name: Checkout code
18-
uses: actions/checkout@v5
25+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
1926

2027
- name: Get asdf version
2128
id: asdf-version
@@ -27,15 +34,15 @@ jobs:
2734
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2835
2936
quality_checks:
30-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v5.1.3
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
3138
needs: [get_asdf_version]
3239
with:
3340
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3441
secrets:
3542
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3643

3744
pr_title_format_check:
38-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/pr_title_check.yml@56891c92a8c3840f4d38464a421acaf323debbb3
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
3946

4047
get_issue_number:
4148
runs-on: ubuntu-22.04
@@ -66,7 +73,7 @@ jobs:
6673

6774
tag_release:
6875
needs: [get_asdf_version]
69-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f3d071da30cd01dc0e4472ac0e2d7452db78d1c7
76+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
7077
with:
7178
dry_run: true
7279
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
@@ -11,7 +11,7 @@ jobs:
1111
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v5
14+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
1515

1616
- name: Get asdf version
1717
id: asdf-version
@@ -23,7 +23,7 @@ jobs:
2323
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2424
2525
quality_checks:
26-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@v5.1.3
26+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
2727
needs: [get_asdf_version]
2828
with:
2929
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -42,7 +42,7 @@ jobs:
4242
4343
tag_release:
4444
needs: [quality_checks, get_commit_id, get_asdf_version]
45-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f3d071da30cd01dc0e4472ac0e2d7452db78d1c7
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@41e3450a9869f278be0e431a4b47b5c77bd55559
4646
with:
4747
dry_run: false
4848
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

0 commit comments

Comments
 (0)