Skip to content

Commit 3137145

Browse files
authored
Chore: [AEA-0000] - use latest common workflows (#545)
## Summary - Routine Change ### Details - use latest common workflow
1 parent 458b843 commit 3137145

File tree

6 files changed

+41
-136
lines changed

6 files changed

+41
-136
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -27,63 +27,43 @@ 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-
runs-on: ubuntu-22.04
31-
outputs:
32-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
33-
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
34-
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
35-
steps:
36-
- name: Checkout code
37-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
38-
39-
- name: Load config value
40-
id: load-config
41-
run: |
42-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
43-
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
44-
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
45-
{
46-
echo "TAG_FORMAT=$TAG_FORMAT"
47-
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
48-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
49-
} >> "$GITHUB_OUTPUT"
30+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
31+
with:
32+
verify_published_from_main_image: true
5033
quality_checks:
51-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
34+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
5235
needs: [get_config_values, get_commit_id]
5336
with:
54-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
37+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
5538
run_docker_scan: true
5639
docker_images: "eps-cdk-utils"
5740
secrets:
5841
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
5942

6043
tag_release:
6144
needs: [quality_checks, get_commit_id, get_config_values]
62-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
45+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
6346
with:
6447
dry_run: true
65-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
48+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
6649
branch_name: main
6750
publish_packages: packages/cdkConstructs,packages/deploymentUtils
6851
tag_format: ${{ needs.get_config_values.outputs.tag_format }}
69-
verify_published_from_main_image: true
7052
secrets: inherit
7153

7254
package_code:
7355
needs: [tag_release, quality_checks, get_commit_id, get_config_values]
7456
uses: ./.github/workflows/docker_image_build.yml
7557
with:
76-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
77-
verify_published_from_main_image: true
58+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
7859
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
7960
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
8061

8162
release_dev:
8263
needs: [tag_release, package_code, get_commit_id, get_config_values]
8364
uses: ./.github/workflows/docker_image_upload.yml
8465
with:
85-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
86-
verify_published_from_main_image: true
66+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
8767
AWS_ENVIRONMENT: dev
8868
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
8969
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -97,8 +77,7 @@ jobs:
9777
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
9878
uses: ./.github/workflows/docker_image_upload.yml
9979
with:
100-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
101-
verify_published_from_main_image: true
80+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
10281
AWS_ENVIRONMENT: qa
10382
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
10483
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -112,8 +91,7 @@ jobs:
11291
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
11392
uses: ./.github/workflows/docker_image_upload.yml
11493
with:
115-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
116-
verify_published_from_main_image: true
94+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
11795
AWS_ENVIRONMENT: ref
11896
VERSION_NUMBER: pre-release-${{ needs.get_commit_id.outputs.sha_short }}
11997
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -126,5 +104,4 @@ jobs:
126104
needs: [quality_checks, get_commit_id, get_config_values]
127105
uses: ./.github/workflows/package_npm_code.yml
128106
with:
129-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
130-
verify_published_from_main_image: true
107+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}

.github/workflows/docker_image_build.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,15 @@ on:
99
COMMIT_ID:
1010
required: true
1111
type: string
12-
runtime_docker_image:
12+
pinned_image:
1313
type: string
1414
required: true
15-
verify_published_from_main_image:
16-
type: boolean
17-
required: true
1815

1916
jobs:
20-
verify_attestation:
21-
uses: NHSDigital/eps-common-workflows/.github/workflows/verify-attestation.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
22-
with:
23-
runtime_docker_image: "${{ inputs.runtime_docker_image }}"
24-
verify_published_from_main_image: ${{ inputs.verify_published_from_main_image }}
2517
docker_image_build:
2618
runs-on: ubuntu-22.04
27-
needs: verify_attestation
2819
container:
29-
image: ${{ needs.verify_attestation.outputs.pinned_image }}
20+
image: ${{ inputs.pinned_image }}
3021
options: --user 1001:1001 --group-add 128
3122
defaults:
3223
run:

.github/workflows/docker_image_upload.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,18 @@ on:
1818
DOCKER_IMAGE_TAG:
1919
required: true
2020
type: string
21-
runtime_docker_image:
21+
pinned_image:
2222
type: string
2323
required: true
24-
verify_published_from_main_image:
25-
type: boolean
26-
required: true
2724
secrets:
2825
CDK_PUSH_IMAGE_ROLE:
2926
required: true
3027

3128
jobs:
32-
verify_attestation:
33-
uses: NHSDigital/eps-common-workflows/.github/workflows/verify-attestation.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
34-
with:
35-
runtime_docker_image: "${{ inputs.runtime_docker_image }}"
36-
verify_published_from_main_image: ${{ inputs.verify_published_from_main_image }}
3729
upload_docker_image:
38-
needs: verify_attestation
3930
runs-on: ubuntu-22.04
4031
container:
41-
image: ${{ needs.verify_attestation.outputs.pinned_image }}
32+
image: ${{ inputs.pinned_image }}
4233
options: --user 1001:1001 --group-add 128
4334
defaults:
4435
run:

.github/workflows/package_npm_code.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,15 @@ name: docker image build
33
on:
44
workflow_call:
55
inputs:
6-
runtime_docker_image:
6+
pinned_image:
77
type: string
88
required: true
9-
verify_published_from_main_image:
10-
type: boolean
11-
required: true
129

1310
jobs:
14-
verify_attestation:
15-
uses: NHSDigital/eps-common-workflows/.github/workflows/verify-attestation.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
16-
with:
17-
runtime_docker_image: "${{ inputs.runtime_docker_image }}"
18-
verify_published_from_main_image: ${{ inputs.verify_published_from_main_image }}
1911
package_npm_code:
2012
runs-on: ubuntu-22.04
21-
needs: [verify_attestation]
2213
container:
23-
image: ${{ needs.verify_attestation.outputs.pinned_image }}
14+
image: ${{ inputs.pinned_image }}
2415
options: --user 1001:1001 --group-add 128
2516
defaults:
2617
run:

.github/workflows/pull_request.yml

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,9 @@ env:
99

1010
jobs:
1111
get_config_values:
12-
runs-on: ubuntu-22.04
13-
outputs:
14-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
15-
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
16-
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
17-
steps:
18-
- name: Checkout code
19-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
20-
21-
- name: Load config value
22-
id: load-config
23-
run: |
24-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
25-
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
26-
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
27-
{
28-
echo "TAG_FORMAT=$TAG_FORMAT"
29-
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
30-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
31-
} >> "$GITHUB_OUTPUT"
12+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
13+
with:
14+
verify_published_from_main_image: false
3215
dependabot-auto-approve-and-merge:
3316
needs: quality_checks
3417
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
@@ -38,10 +21,10 @@ jobs:
3821
pr_title_format_check:
3922
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
4023
quality_checks:
41-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
24+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
4225
needs: [get_config_values, get_commit_id]
4326
with:
44-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
27+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
4528
run_docker_scan: true
4629
docker_images: "eps-cdk-utils"
4730

@@ -97,15 +80,13 @@ jobs:
9780
with:
9881
VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
9982
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
100-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
101-
verify_published_from_main_image: false
83+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
10284

10385
package_npm_code:
10486
needs: [quality_checks, get_commit_id, get_config_values]
10587
uses: ./.github/workflows/package_npm_code.yml
10688
with:
107-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
108-
verify_published_from_main_image: false
89+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
10990

11091
release_docker_image:
11192
needs:
@@ -117,18 +98,16 @@ jobs:
11798
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
11899
TAG_LATEST: false
119100
DOCKER_IMAGE_TAG: PR-${{ needs.get_issue_number.outputs.issue_number }}-${{ needs.get_commit_id.outputs.sha_short }}
120-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
121-
verify_published_from_main_image: false
101+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
122102
secrets:
123103
CDK_PUSH_IMAGE_ROLE: ${{ secrets.DEV_CDK_PUSH_IMAGE_ROLE }}
124104

125105
tag_release:
126106
needs: [get_commit_id, get_config_values]
127-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
107+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
128108
with:
129109
dry_run: true
130-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
131-
verify_published_from_main_image: false
110+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
132111
branch_name: ${{ github.event.pull_request.head.ref }}
133112
publish_packages: packages/cdkConstructs,packages/deploymentUtils
134113
tag_format: ${{ needs.get_config_values.outputs.tag_format }}

.github/workflows/release.yml

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,9 @@ env:
1010

1111
jobs:
1212
get_config_values:
13-
runs-on: ubuntu-22.04
14-
outputs:
15-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
16-
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
17-
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
18-
steps:
19-
- name: Checkout code
20-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
21-
22-
- name: Load config value
23-
id: load-config
24-
run: |
25-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
26-
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
27-
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
28-
{
29-
echo "TAG_FORMAT=$TAG_FORMAT"
30-
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
31-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
32-
} >> "$GITHUB_OUTPUT"
13+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
14+
with:
15+
verify_published_from_main_image: true
3316
get_commit_id:
3417
runs-on: ubuntu-22.04
3518
outputs:
@@ -49,25 +32,24 @@ jobs:
4932
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
5033
echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
5134
quality_checks:
52-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
35+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
5336
needs: [get_config_values, get_commit_id]
5437
with:
55-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
38+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
5639
run_docker_scan: true
5740
docker_images: "eps-cdk-utils"
5841
secrets:
5942
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
6043

6144
tag_release:
6245
needs: [quality_checks, get_commit_id, get_config_values]
63-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
46+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@8404cf6e3a61ac8de4d1644e175e288aa4965815
6447
with:
6548
dry_run: false
66-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
49+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
6750
branch_name: main
6851
publish_packages: packages/cdkConstructs,packages/deploymentUtils
6952
tag_format: ${{ needs.get_config_values.outputs.tag_format }}
70-
verify_published_from_main_image: true
7153
secrets: inherit
7254

7355
package_code:
@@ -76,15 +58,13 @@ jobs:
7658
with:
7759
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
7860
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
79-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
80-
verify_published_from_main_image: true
61+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
8162

8263
release_dev:
8364
needs: [tag_release, package_code, get_commit_id, get_config_values]
8465
uses: ./.github/workflows/docker_image_upload.yml
8566
with:
86-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
87-
verify_published_from_main_image: true
67+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
8868
AWS_ENVIRONMENT: dev
8969
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
9070
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -98,8 +78,7 @@ jobs:
9878
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
9979
uses: ./.github/workflows/docker_image_upload.yml
10080
with:
101-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
102-
verify_published_from_main_image: true
81+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
10382
AWS_ENVIRONMENT: qa
10483
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
10584
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -113,8 +92,7 @@ jobs:
11392
[tag_release, release_dev, package_code, get_commit_id, get_config_values]
11493
uses: ./.github/workflows/docker_image_upload.yml
11594
with:
116-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
117-
verify_published_from_main_image: true
95+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
11896
AWS_ENVIRONMENT: ref
11997
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
12098
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -128,8 +106,7 @@ jobs:
128106
[tag_release, release_qa, package_code, get_commit_id, get_config_values]
129107
uses: ./.github/workflows/docker_image_upload.yml
130108
with:
131-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
132-
verify_published_from_main_image: true
109+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
133110
AWS_ENVIRONMENT: int
134111
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
135112
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
@@ -143,8 +120,7 @@ jobs:
143120
[tag_release, release_int, package_code, get_commit_id, get_config_values]
144121
uses: ./.github/workflows/docker_image_upload.yml
145122
with:
146-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
147-
verify_published_from_main_image: true
123+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
148124
AWS_ENVIRONMENT: prod
149125
VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
150126
COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}

0 commit comments

Comments
 (0)