Skip to content

Commit 45b516f

Browse files
committed
[skip ci] Propagate release-tag through workflow
1 parent 26ac316 commit 45b516f

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/release-winget.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
outputs:
2626
channel: ${{ steps.check.outputs.channel }}
2727
version: ${{ steps.check.outputs.version }}
28+
release-tag: ${{ steps.check.outputs.release-tag }}
2829
steps:
2930
- name: Check Release Name and Extract Version
3031
id: check
@@ -33,8 +34,10 @@ jobs:
3334
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
3435
VERSION="${{ inputs.version }}"
3536
CHANNEL="${{ inputs.channel }}"
37+
RELEASE_TAG="${{ inputs.release-tag }}"
3638
else
3739
RELEASE_NAME="${{ github.event.release.name }}"
40+
RELEASE_TAG="${{ github.event.release.tag_name }}"
3841
if [[ "$RELEASE_NAME" =~ (\d+\.\d+\.\d+) ]]; then
3942
VERSION="${BASH_REMATCH[1]}"
4043
else
@@ -51,8 +54,10 @@ jobs:
5154
5255
echo "Detected Channel: $CHANNEL"
5356
echo "Detected Version: $VERSION"
57+
echo "Detected Release Tag: $RELEASE_TAG"
5458
echo "channel=$CHANNEL" >> $GITHUB_OUTPUT
5559
echo "version=$VERSION" >> $GITHUB_OUTPUT
60+
echo "release-tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
5661
5762
publish_stable:
5863
needs: determine_channel
@@ -64,7 +69,7 @@ jobs:
6469
with:
6570
identifier: CollapseLauncher.Collapse
6671
version: ${{ needs.determine_channel.outputs.version }}
67-
release-tag: ${{ github.event_name == 'workflow_dispatch' && inputs.release-tag || github.event.release.tag_name }}
72+
release-tag: ${{ needs.determine_channel.outputs.release-tag }}
6873
installers-regex: '\.exe$'
6974
token: ${{ secrets.WINGET_TOKEN }}
7075

@@ -78,6 +83,6 @@ jobs:
7883
with:
7984
identifier: CollapseLauncher.Collapse.Preview
8085
version: ${{ needs.determine_channel.outputs.version }}
81-
release-tag: ${{ github.event_name == 'workflow_dispatch' && inputs.release-tag || github.event.release.tag_name }}
86+
release-tag: ${{ needs.determine_channel.outputs.release-tag }}
8287
installers-regex: '\.exe$'
8388
token: ${{ secrets.WINGET_TOKEN }}

0 commit comments

Comments
 (0)