Skip to content

Commit 0e0a437

Browse files
authored
Merge branch 'main' into dependabot/npm_and_yarn/vitejs/plugin-react-swc-4.2.0
2 parents ebe0e51 + 3f3c700 commit 0e0a437

File tree

3 files changed

+57
-50
lines changed

3 files changed

+57
-50
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/[email protected]
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 & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@ 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
get_commit_message:
1230
runs-on: ubuntu-22.04
1331
outputs:
@@ -25,8 +43,10 @@ jobs:
2543
2644
quality_checks:
2745
# always run, but only block in the non-skip case
28-
needs: [get_commit_message]
29-
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
46+
needs: [get_commit_message, get_asdf_version]
47+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
48+
with:
49+
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3050
secrets:
3151
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3252

@@ -122,24 +142,6 @@ jobs:
122142
}
123143
result-encoding: string
124144

125-
get_asdf_version:
126-
runs-on: ubuntu-22.04
127-
outputs:
128-
asdf_version: ${{ steps.asdf-version.outputs.version }}
129-
tag_format: ${{ steps.load-config.outputs.TAG_FORMAT }}
130-
steps:
131-
- name: Checkout code
132-
uses: actions/checkout@v5
133-
134-
- name: Get asdf version
135-
id: asdf-version
136-
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
137-
- name: Load config value
138-
id: load-config
139-
run: |
140-
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
141-
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
142-
143145
tag_release:
144146
needs: [get_asdf_version]
145147
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@2a3f4ab96e04b7547c4ee5b786745b98809c89be

.github/workflows/release.yml

Lines changed: 17 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:
@@ -39,6 +24,23 @@ jobs:
3924
run: |
4025
TAG_FORMAT=$(yq '.TAG_FORMAT' .github/config/settings.yml)
4126
echo "TAG_FORMAT=$TAG_FORMAT" >> "$GITHUB_OUTPUT"
27+
quality_checks:
28+
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
29+
needs: [get_asdf_version]
30+
with:
31+
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
32+
secrets:
33+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
34+
35+
get_commit_id:
36+
runs-on: ubuntu-22.04
37+
outputs:
38+
commit_id: ${{ steps.commit_id.outputs.commit_id }}
39+
steps:
40+
- name: Get Commit ID
41+
id: commit_id
42+
run: |
43+
echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
4244
4345
tag_release:
4446
needs: [quality_checks, get_commit_id, get_asdf_version]

0 commit comments

Comments
 (0)