diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5f13a6a..8567c933 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,8 @@ name: build on: push: + paths-ignore: + '.github/workflows/dist.yml' jobs: win64: diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index 27f8534b..491b59c6 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -21,8 +21,6 @@ jobs: dist: # The type of runner that the job will run on runs-on: ubuntu-latest - env: - RELEASE_TAG_NAME: 'v${{github.event.inputs.version}}' if: ${{ github.event.workflow_run.conclusion == 'success' || github.event.inputs.version != '' }} @@ -32,15 +30,18 @@ jobs: - uses: actions/checkout@v3 - name: Check release version - shell: pwsh id: check_ver + shell: pwsh run: | $commit_msg = "$(git show -s --format=%s)" + echo "commit_msg: $commit_msg" $matchInfo = [Regex]::Match($commit_msg, '\[release\s(\d+\.)+(-)?(\*|\d+)\]') if ($matchInfo.Success) { $matchInfo = [Regex]::Match($matchInfo.Value, '(\d+\.)+(-)?(\*|\d+)') } - $release_ver = if($matchInfo.Success) { $matchInfo.Value } else { '${{github.event.inputs.version}}' } - echo "release_ver=$release_ver" >> $GITHUB_OUTPUT - echo "release_tag=v$release_ver" >> $GITHUB_OUTPUT + if (!$matchInfo.Success) { $matchInfo = [Regex]::Match('${{github.event.inputs.version}}', '(\d+\.)+(-)?(\*|\d+)') } + $release_ver = if($matchInfo.Success) { $matchInfo.Value } else { '' } + echo "release_ver=$release_ver" + echo "release_ver=$release_ver" >> ${env:GITHUB_OUTPUT} + echo "release_tag=v$release_ver" >> ${env:GITHUB_OUTPUT} - name: Download artifacts from workflow build if: ${{ steps.check_ver.outputs.release_ver != '' }}