Skip to content

Commit ada686f

Browse files
anthony-nhsanthony-nhs
authored
Chore: [AEA-0000] - upgrade to latest common workflows (#669)
## Summary - Routine Change ### Details - upgrade to latest common workflows
1 parent 2873ab3 commit ada686f

3 files changed

Lines changed: 23 additions & 75 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,24 @@ on:
66

77
jobs:
88
get_config_values:
9-
runs-on: ubuntu-22.04
10-
outputs:
11-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
12-
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
13-
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
14-
steps:
15-
- name: Checkout code
16-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
17-
18-
- name: Load config value
19-
id: load-config
20-
run: |
21-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
22-
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
23-
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
24-
{
25-
echo "TAG_FORMAT=$TAG_FORMAT"
26-
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
27-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
28-
} >> "$GITHUB_OUTPUT"
9+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
10+
with:
11+
verify_published_from_main_image: true
2912

3013
quality_checks:
31-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
14+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
3215
needs: [get_config_values]
3316
with:
34-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
17+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
3518
secrets:
3619
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3720

3821
tag_release:
3922
needs: [quality_checks, get_config_values]
40-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
23+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
4124
with:
4225
dry_run: true
43-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
26+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
4427
branch_name: main
4528
publish_packages: .
4629
tag_format: ${{ needs.get_config_values.outputs.tag_format }}

‎.github/workflows/pull_request.yml‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,32 @@ on:
77
jobs:
88
dependabot-auto-approve-and-merge:
99
needs: quality_checks
10-
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
10+
uses: NHSDigital/eps-common-workflows/.github/workflows/dependabot-auto-approve-and-merge.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
1111
secrets:
1212
AUTOMERGE_APP_ID: ${{ secrets.AUTOMERGE_APP_ID }}
1313
AUTOMERGE_PEM: ${{ secrets.AUTOMERGE_PEM }}
14-
1514
get_config_values:
16-
runs-on: ubuntu-22.04
17-
outputs:
18-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
19-
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
20-
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
21-
steps:
22-
- name: Checkout code
23-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
24-
25-
- name: Load config value
26-
id: load-config
27-
run: |
28-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
29-
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
30-
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
31-
{
32-
echo "TAG_FORMAT=$TAG_FORMAT"
33-
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
34-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
35-
} >> "$GITHUB_OUTPUT"
15+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
16+
with:
17+
verify_published_from_main_image: false
3618

3719
quality_checks:
38-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
20+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
3921
needs: [get_config_values]
4022
with:
41-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
23+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
4224
secrets:
4325
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4426

4527
pr_title_format_check:
46-
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@d215f841eb18b803e339e4ed597ed1f30e086e17
28+
uses: NHSDigital/eps-common-workflows/.github/workflows/pr_title_check.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
4729

4830
tag_release:
4931
needs: [get_config_values]
50-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
32+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
5133
with:
5234
dry_run: true
53-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
35+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
5436
branch_name: ${{ github.event.pull_request.head.ref }}
5537
publish_packages: .
5638
tag_format: ${{ needs.get_config_values.outputs.tag_format }}

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,23 @@ on:
77

88
jobs:
99
get_config_values:
10-
runs-on: ubuntu-22.04
11-
outputs:
12-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
13-
devcontainer_version: ${{ steps.load-config.outputs.DEVCONTAINER_VERSION }}
14-
devcontainer_image: ${{ steps.load-config.outputs.DEVCONTAINER_IMAGE }}
15-
steps:
16-
- name: Checkout code
17-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
18-
19-
- name: Load config value
20-
id: load-config
21-
run: |
22-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
23-
DEVCONTAINER_IMAGE=$(jq -r '.build.args.IMAGE_NAME' .devcontainer/devcontainer.json)
24-
DEVCONTAINER_VERSION=$(jq -r '.build.args.IMAGE_VERSION' .devcontainer/devcontainer.json)
25-
{
26-
echo "TAG_FORMAT=$TAG_FORMAT"
27-
echo "DEVCONTAINER_IMAGE=$DEVCONTAINER_IMAGE"
28-
echo "DEVCONTAINER_VERSION=$DEVCONTAINER_VERSION"
29-
} >> "$GITHUB_OUTPUT"
10+
uses: NHSDigital/eps-common-workflows/.github/workflows/get-repo-config.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
11+
with:
12+
verify_published_from_main_image: true
3013
quality_checks:
31-
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
14+
uses: NHSDigital/eps-common-workflows/.github/workflows/quality-checks-devcontainer.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
3215
needs: [get_config_values]
3316
with:
34-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
17+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
3518
secrets:
3619
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3720

3821
tag_release:
3922
needs: [quality_checks, get_config_values]
40-
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@36677e1d6bfaa010d7b78942a1ade12fbefecb80
23+
uses: NHSDigital/eps-common-workflows/.github/workflows/tag-release-devcontainer.yml@2a083514efbae0b9ddacfcc87b9d285767b686b8
4124
with:
4225
dry_run: false
43-
runtime_docker_image: "${{ needs.get_config_values.outputs.devcontainer_image }}:githubactions-${{ needs.get_config_values.outputs.devcontainer_version }}"
26+
pinned_image: ${{ needs.get_config_values.outputs.pinned_image }}
4427
branch_name: main
4528
publish_packages: .
4629
tag_format: ${{ needs.get_config_values.outputs.tag_format }}

0 commit comments

Comments
 (0)