diff --git a/.github/workflows/merge_master.yaml b/.github/workflows/merge_master.yaml index a81add1..22f84c6 100644 --- a/.github/workflows/merge_master.yaml +++ b/.github/workflows/merge_master.yaml @@ -13,7 +13,7 @@ jobs: outputs: build_number: ${{ steps.short_sha.outputs.value }} new_release: ${{ steps.semantic.outputs.new_release_published }} - release: ${{ steps.semantic.outputs.new_release_version }} + release: ${{ steps.version.outputs.value }} release_notes: ${{ steps.semantic.outputs.new_release_notes }} steps: @@ -32,6 +32,10 @@ jobs: id: short_sha run: echo "::set-output name=value::$(git rev-parse --short HEAD)" + - name: Remove prefix 'v' from version + id: version + run: echo "::set-output name=value::`echo ${{ steps.semantic.outputs.new_release_version }} | sed -r 's|v()|\1|'`" + build: if: needs.prepare.outputs.new_release == 'true' @@ -70,6 +74,7 @@ jobs: needs: [ prepare, build ] steps: + - name: Create Pre Release uses: actions/create-release@v1 env: @@ -77,7 +82,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} VERSION: ${{ needs.prepare.outputs.release }} with: - tag_name: ${{ env.VERSION }}.${{ env.BUILD }} + tag_name: v${{ env.VERSION }}.${{ env.BUILD }} release_name: ${{ env.VERSION }}.${{ env.BUILD }} body: ${{ github.event.head_commit.message }} prerelease: true @@ -102,7 +107,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} with: - tag_name: ${{ needs.prepare.outputs.release }} + tag_name: v${{ needs.prepare.outputs.release }} release_name: ${{ needs.prepare.outputs.release }} body: ${{ needs.prepare.outputs.release_notes }} draft: true diff --git a/.releaserc.json b/.releaserc.json index 80b0ec0..bcd5b50 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -1,5 +1,4 @@ { - "tagFormat": "${version}", "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator",