Skip to content

Commit 22699b9

Browse files
anthony-nhsanthony-nhs
committed
set input
1 parent e42780d commit 22699b9

File tree

3 files changed

+58
-49
lines changed

3 files changed

+58
-49
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ env:
88
BRANCH_NAME: ${{ github.event.ref.BRANCH_NAME }}
99

1010
jobs:
11-
quality_checks:
12-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
13-
secrets:
14-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
15-
16-
get_commit_id:
17-
runs-on: ubuntu-22.04
18-
outputs:
19-
commit_id: ${{ steps.commit_id.outputs.commit_id }}
20-
steps:
21-
- name: Get Commit ID
22-
id: commit_id
23-
run: |
24-
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
25-
2611
get_asdf_version:
2712
runs-on: ubuntu-22.04
2813
outputs:
@@ -41,6 +26,24 @@ jobs:
4126
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4227
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
4328
29+
quality_checks:
30+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@4a6d03ad51516eddc448daf454805f85fe2025b9
31+
needs: [get_asdf_version]
32+
with:
33+
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
34+
secrets:
35+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
36+
37+
get_commit_id:
38+
runs-on: ubuntu-22.04
39+
outputs:
40+
commit_id: ${{ steps.commit_id.outputs.commit_id }}
41+
steps:
42+
- name: Get Commit ID
43+
id: commit_id
44+
run: |
45+
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
46+
4447
tag_release:
4548
needs: [quality_checks, get_commit_id, get_asdf_version]
4649
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@2a3f4ab96e04b7547c4ee5b786745b98809c89be

‎.github/workflows/pull_request.yml‎

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

1010
jobs:
11+
get_asdf_version:
12+
runs-on: ubuntu-22.04
13+
outputs:
14+
asdf_version: ${{ steps.asdf-version.outputs.version }}
15+
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v5
19+
20+
- name: Get asdf version
21+
id: asdf-version
22+
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
23+
- name: Load config value
24+
id: load-config
25+
run: |
26+
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
27+
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
28+
1129
quality_checks:
12-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
30+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@4a6d03ad51516eddc448daf454805f85fe2025b9
31+
needs: [get_asdf_version]
32+
with:
33+
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
1334
secrets:
1435
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
1536

@@ -42,24 +63,6 @@ jobs:
4263
}
4364
result-encoding: string
4465

45-
get_asdf_version:
46-
runs-on: ubuntu-22.04
47-
outputs:
48-
asdf_version: ${{ steps.asdf-version.outputs.version }}
49-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
50-
steps:
51-
- name: Checkout code
52-
uses: actions/checkout@v5
53-
54-
- name: Get asdf version
55-
id: asdf-version
56-
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
57-
- name: Load config value
58-
id: load-config
59-
run: |
60-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
61-
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
62-
6366
tag_release:
6467
needs: [get_asdf_version]
6568
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@2a3f4ab96e04b7547c4ee5b786745b98809c89be

‎.github/workflows/release.yml‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@ env:
77
BRANCH_NAME: ${{ github.event.ref.BRANCH_NAME }}
88

99
jobs:
10-
quality_checks:
11-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
12-
secrets:
13-
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
14-
15-
get_commit_id:
16-
runs-on: ubuntu-22.04
17-
outputs:
18-
commit_id: ${{ steps.commit_id.outputs.commit_id }}
19-
steps:
20-
- name: Get Commit ID
21-
id: commit_id
22-
run: |
23-
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
24-
2510
get_asdf_version:
2611
runs-on: ubuntu-22.04
2712
outputs:
@@ -40,6 +25,24 @@ jobs:
4025
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4126
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
4227
28+
quality_checks:
29+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/quality-checks.yml@4a6d03ad51516eddc448daf454805f85fe2025b9
30+
needs: [get_asdf_version]
31+
with:
32+
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
33+
secrets:
34+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
35+
36+
get_commit_id:
37+
runs-on: ubuntu-22.04
38+
outputs:
39+
commit_id: ${{ steps.commit_id.outputs.commit_id }}
40+
steps:
41+
- name: Get Commit ID
42+
id: commit_id
43+
run: |
44+
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
45+
4346
tag_release:
4447
needs: [quality_checks, get_commit_id, get_asdf_version]
4548
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@2a3f4ab96e04b7547c4ee5b786745b98809c89be

0 commit comments

Comments
 (0)