Skip to content

Commit 679c6af

Browse files
authored
Fix: [AEA-0000] - use common workflows (#556)
## Summary - Routine Change ### Details - use common workflows
1 parent a1bc54e commit 679c6af

File tree

7 files changed

+19
-257
lines changed

7 files changed

+19
-257
lines changed

.devcontainer/devcontainer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
},
1818
"mounts": [
1919
"source=${env:HOME}${env:USERPROFILE}/.ssh,target=/home/vscode/.ssh,type=bind",
20-
"source=${env:HOME}${env:USERPROFILE}/.gnupg,target=/home/vscode/.gnupg,type=bind"
20+
"source=${env:HOME}${env:USERPROFILE}/.gnupg,target=/home/vscode/.gnupg,type=bind",
21+
"source=${env:HOME}${env:USERPROFILE}/.gitconfig,target=/home/vscode/.gitconfig,type=bind"
2122
],
2223
"customizations": {
2324
"vscode": {

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1616

1717
- name: Get asdf version
1818
id: asdf-version
@@ -24,7 +24,7 @@ jobs:
2424
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2525
2626
quality_checks:
27-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@ad79b8f5d8dc258c9ec731dc9f6dc47c9f1e7375
27+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
2828
needs: [get_asdf_version]
2929
with:
3030
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -33,7 +33,7 @@ jobs:
3333

3434
tag_release:
3535
needs: [quality_checks, get_asdf_version]
36-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
36+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
3737
with:
3838
dry_run: true
3939
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/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
@@ -5,14 +5,21 @@ on:
55
branches: [main]
66

77
jobs:
8+
dependabot-auto-approve-and-merge:
9+
needs: quality_checks
10+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
11+
secrets:
12+
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
13+
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
14+
815
get_asdf_version:
916
runs-on: ubuntu-22.04
1017
outputs:
1118
asdf_version: ${{ steps.asdf-version.outputs.version }}
1219
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1320
steps:
1421
- name: Checkout code
15-
uses: actions/checkout@v5
22+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1623

1724
- name: Get asdf version
1825
id: asdf-version
@@ -23,19 +30,19 @@ jobs:
2330
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
2431
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2532
quality_checks:
26-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@ad79b8f5d8dc258c9ec731dc9f6dc47c9f1e7375
33+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
2734
needs: [get_asdf_version]
2835
with:
2936
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3037
secrets:
3138
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3239

3340
pr_title_format_check:
34-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/pr_title_check.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
41+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
3542

3643
tag_release:
3744
needs: [get_asdf_version]
38-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
3946
with:
4047
dry_run: true
4148
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
@@ -13,7 +13,7 @@ jobs:
1313
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
1414
steps:
1515
- name: Checkout code
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
1717

1818
- name: Get asdf version
1919
id: asdf-version
@@ -25,7 +25,7 @@ jobs:
2525
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
2626
2727
quality_checks:
28-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@ad79b8f5d8dc258c9ec731dc9f6dc47c9f1e7375
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
2929
needs: [get_asdf_version]
3030
with:
3131
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
@@ -34,7 +34,7 @@ jobs:
3434

3535
tag_release:
3636
needs: [quality_checks, get_asdf_version]
37-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@b49130ecbac4f0a052642f6417a0ea0555240fd7
37+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release.yml@4fb41faab9c92d8a1444719bc1ab45a989caf756
3838
with:
3939
dry_run: false
4040
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

0 commit comments

Comments
 (0)