Skip to content

Commit 0a792ad

Browse files
committed
fix(ci): use RELEASE_TAG env for workflow_dispatch compatibility
1 parent 716e4a3 commit 0a792ad

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

.github/workflows/release-please.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ jobs:
3636
owner: context.repo.owner,
3737
repo: context.repo.repo,
3838
workflow_id: 'release.yml',
39-
ref: '${{ needs.release-please.outputs.tag_name }}',
39+
ref: 'main',
40+
inputs: {
41+
tag: '${{ needs.release-please.outputs.tag_name }}',
42+
},
4043
});
4144
4245
update-readme:

.github/workflows/release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
env:
1414
CARGO_TERM_COLOR: always
1515
BINARY_NAME: null-e
16+
RELEASE_TAG: ${{ github.event.inputs.tag || github.ref_name }}
1617

1718
permissions:
1819
contents: write
@@ -165,11 +166,11 @@ jobs:
165166
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
166167
with:
167168
projectPath: ./tauri
168-
tagName: ${{ github.ref_name }}
169-
releaseName: 'null-e ${{ github.ref_name }}'
169+
tagName: ${{ env.RELEASE_TAG }}
170+
releaseName: 'null-e ${{ env.RELEASE_TAG }}'
170171
releaseBody: ''
171172
releaseDraft: false
172-
prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
173+
prerelease: ${{ contains(env.RELEASE_TAG, 'alpha') || contains(env.RELEASE_TAG, 'beta') || contains(env.RELEASE_TAG, 'rc') }}
173174
args: --target ${{ matrix.target }}
174175

175176
release:
@@ -196,7 +197,7 @@ jobs:
196197
files: release/*
197198
generate_release_notes: true
198199
draft: false
199-
prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
200+
prerelease: ${{ contains(env.RELEASE_TAG, 'alpha') || contains(env.RELEASE_TAG, 'beta') || contains(env.RELEASE_TAG, 'rc') }}
200201
env:
201202
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
202203

@@ -231,7 +232,7 @@ jobs:
231232
with:
232233
formula-name: null-e
233234
homebrew-tap: us/homebrew-tap
234-
download-url: https://github.com/us/null-e/archive/refs/tags/${{ github.ref_name }}.tar.gz
235+
download-url: https://github.com/us/null-e/archive/refs/tags/${{ env.RELEASE_TAG }}.tar.gz
235236
env:
236237
COMMITTER_TOKEN: ${{ secrets.HOMEBREW_TAP_TOKEN }}
237238
continue-on-error: true

0 commit comments

Comments
 (0)