Skip to content

Commit 8b81bb3

Browse files
committed
fix
1 parent 88ed30f commit 8b81bb3

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

.github/workflows/pull-request.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,28 @@ jobs:
6464
id: extract-version
6565
uses: './.github/actions/versioning/extract-version'
6666
with:
67-
branch-name: ${{ github.ref_name }}
67+
branch-name: ${{ github.base_ref }}
6868
- name: 'Create pre-release tag'
6969
shell: bash
7070
id: create-pre-release-tag
71+
env:
72+
build-number: ${{ steps.create-build-number.outputs.build-number }}
7173
run: |
7274
if [[ '${{ needs.workflow-variables.outputs.is-release }}' == 'true' ]]; then
7375
echo "pre-release-tag=" >> $GITHUB_OUTPUT
76+
elif [[ '${{ needs.workflow-variables.outputs.is-preview }}' == 'true' ]]; then
77+
pre_release_tag='preview'
78+
echo "pre-release-tag=$pre_release_tag" >> $GITHUB_OUTPUT
7479
else
75-
pre_release_tag=$(echo ${{ github.ref_name }} | tr '/' '.' | tr '-' '.'| tr '_' '.')
80+
pre_release_tag=$(echo ${{ github.base_ref }} | tr '/' '-' | tr '.' '-'| tr '_' '-')
7681
echo "pre-release-tag=$pre_release_tag" >> $GITHUB_OUTPUT
7782
fi
7883
- name: 'Create build number'
7984
shell: bash
8085
id: create-build-number
8186
run: |
8287
git fetch --unshallow --filter=tree:0
83-
build_number=$(git rev-list --count origin/${{ github.ref_name }} ^origin/main)
88+
build_number=$(git rev-list --count origin/${{ github.base_ref }} ^origin/main)
8489
echo "build-number=$build_number" >> $GITHUB_OUTPUT
8590
- name: 'Format version'
8691
id: format-version

0 commit comments

Comments
 (0)