Skip to content

Commit 1a30db5

Browse files
chore: tagging fix until unified method
1 parent 380981a commit 1a30db5

File tree

3 files changed

+7
-15
lines changed

3 files changed

+7
-15
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Get asdf version
2121
id: asdf-version
22-
run: echo "version=0.18.0" >> "$GITHUB_OUTPUT"
22+
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
2323

2424
- name: Load config value
2525
id: load-config
@@ -29,9 +29,6 @@ jobs:
2929
3030
quality_checks:
3131
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
32-
needs: [get_asdf_version]
33-
with:
34-
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3532
secrets:
3633
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3734

@@ -47,7 +44,7 @@ jobs:
4744
4845
tag_release:
4946
needs: [quality_checks, get_commit_id, get_asdf_version]
50-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f80157cecce288dd175e61b477a1d2dbe9c88b99
47+
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@2a3f4ab96e04b7547c4ee5b786745b98809c89be
5148
with:
5249
dry_run: true
5350
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}

.github/workflows/pull_request.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ jobs:
2929
3030
quality_checks:
3131
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
32-
needs: [get_asdf_version]
33-
with:
34-
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
3532
secrets:
3633
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3734

.github/workflows/release.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: deploy to environments
2+
# Trigger workflows test
23

34
on:
45
workflow_dispatch:
@@ -11,7 +12,7 @@ on:
1112
branches: [main]
1213

1314
env:
14-
BRANCH_NAME: ${{ github.event.ref.BRANCH_NAME }}
15+
BRANCH_NAME: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
1516

1617
jobs:
1718
get_asdf_version:
@@ -25,7 +26,7 @@ jobs:
2526

2627
- name: Get asdf version
2728
id: asdf-version
28-
run: echo "version=0.18.0" >> "$GITHUB_OUTPUT"
29+
run: echo "version=$(awk '!/^#/ && NF {print $1; exit}' .tool-versions.asdf)" >> "$GITHUB_OUTPUT"
2930

3031
- name: Load config value
3132
id: load-config
@@ -35,9 +36,6 @@ jobs:
3536
3637
quality_checks:
3738
uses: NHSDigital/eps-workflow-quality-checks/.github/workflows/[email protected]
38-
needs: [get_asdf_version]
39-
with:
40-
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
4139
secrets:
4240
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
4341

@@ -53,9 +51,9 @@ jobs:
5351
5452
tag_release:
5553
needs: [quality_checks, get_commit_id, get_asdf_version]
56-
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@f80157cecce288dd175e61b477a1d2dbe9c88b99
54+
uses: NHSDigital/eps-workflow-semantic-release/.github/workflows/tag-release.yml@2a3f4ab96e04b7547c4ee5b786745b98809c89be
5755
with:
58-
dry_run: false
56+
dry_run: true
5957
asdfVersion: ${{ needs.get_asdf_version.outputs.asdf_version }}
6058
branch_name: main
6159
publish_package: false

0 commit comments

Comments
 (0)