diff --git a/.github/workflows/Create-Release-PR.yml b/.github/workflows/Create-Release-PR.yml index 75a1c08d..d30f7eec 100644 --- a/.github/workflows/Create-Release-PR.yml +++ b/.github/workflows/Create-Release-PR.yml @@ -37,9 +37,9 @@ jobs: uses: peter-evans/create-pull-request@v7 with: token: ${{ secrets.RELEASE_TOKEN }} - branch: release/v${{inputs.new_version}} - commit-message: 'Release v${{inputs.new_version}}' - title: 'Release v${{inputs.new_version}}' + branch: release/${{inputs.new_version}} + commit-message: 'Release ${{inputs.new_version}}' + title: 'Release ${{inputs.new_version}}' delete-branch: true body: > This PR is auto-generated by diff --git a/.github/workflows/PR-Release-Warning.yml b/.github/workflows/PR-Release-Warning.yml index 6e450f04..292d577e 100644 --- a/.github/workflows/PR-Release-Warning.yml +++ b/.github/workflows/PR-Release-Warning.yml @@ -14,7 +14,7 @@ jobs: - name: check branch name id: check-release run: | - if [[ ${{ github.head_ref }} =~ ^release/(v[0-9]+\.[0-9]+\.[0-9]+$) ]]; then + if [[ ${{ github.head_ref }} =~ ^release/([0-9]+\.[0-9]+\.[0-9]+$) ]]; then echo "match=true" >> $GITHUB_OUTPUT fi - name: add comment if PR is release diff --git a/.github/workflows/Tag-And-Release.yml b/.github/workflows/Tag-And-Release.yml index a1f7984b..8b336475 100644 --- a/.github/workflows/Tag-And-Release.yml +++ b/.github/workflows/Tag-And-Release.yml @@ -12,7 +12,7 @@ jobs: - name: Check if merge is release branch id: check-release run: | - if [[ ${{ github.head_ref }} =~ ^release/(v[0-9]+\.[0-9]+\.[0-9]+$) ]]; then + if [[ ${{ github.head_ref }} =~ ^release/([0-9]+\.[0-9]+\.[0-9]+$) ]]; then echo "match=true" >> $GITHUB_OUTPUT echo "version=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT fi @@ -26,9 +26,9 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: version bump to ${{ steps.check-release.outputs.version }} - tagging_message: 'v${{ steps.check-release.outputs.version }}' + tagging_message: '${{ steps.check-release.outputs.version }}' - uses: ncipollo/release-action@v1 with: - tag: v${{ steps.check-release.outputs.version }} + tag: ${{ steps.check-release.outputs.version }} prerelease: true generateReleaseNotes: true