Skip to content

Commit 37e158a

Browse files
committed
updated fixed
1 parent 37744fc commit 37e158a

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
outputs:
36-
is-release: ${{ startsWith(github.ref_name, 'release') }}
37-
is-preview: ${{ startsWith(github.ref_name, 'preview') }}
36+
is-release: ${{ startsWith(github.base_ref, 'release') }}
37+
is-preview: ${{ startsWith(github.base_ref, 'preview') }}
3838

3939
steps:
4040
- name: 'Set workflow variables'
4141
id: github
4242
run: |
43-
echo "is-release:${{ startsWith(github.ref_name, 'release') }}"
44-
echo "is-preview:${{ startsWith(github.ref_name, 'preview') }}"
43+
echo "is-release:${{ startsWith(github.base_ref, 'release') }}"
44+
echo "is-preview:${{ startsWith(github.base_ref, 'preview') }}"
4545
4646
validate-release:
4747
name: 'Validate release'
@@ -80,7 +80,7 @@ jobs:
8080
id: extract-version
8181
uses: './.github/actions/versioning/extract-version'
8282
with:
83-
branch-name: ${{ github.ref_name }}
83+
branch-name: ${{ github.base_ref }}
8484
- name: 'Create build number'
8585
shell: bash
8686
id: create-build-number
@@ -241,13 +241,15 @@ jobs:
241241

242242
release:
243243
name: 'Create release'
244-
needs: [publish-package, validate-release]
244+
needs: [publish-package, validate-release, versioning]
245245
runs-on: ubuntu-latest
246+
env:
247+
release-version: ${{ needs.versioning.outputs.release-version }}
246248
steps:
247249
- name: 'Checkout ${{ github.head_ref || github.ref }}'
248250
uses: actions/checkout@v5
249251

250252
- name: 'Create GitHub Release'
251253
uses: ./.github/actions/github/create-release
252254
with:
253-
release-version: ${{ github.ref_name }}
255+
release-version: ${{ env.release-version }}

0 commit comments

Comments
 (0)