diff --git a/.github/workflows/release-on-merge.yml b/.github/workflows/release-on-merge.yml index 808d9f6..aec8317 100644 --- a/.github/workflows/release-on-merge.yml +++ b/.github/workflows/release-on-merge.yml @@ -21,7 +21,9 @@ jobs: echo Computing next tag number LASTPATCH=$(git describe --tags | cut -d- -f1 | cut -d. -f3) PATCH=$(($LASTPATCH+1)) - echo "::set-output name=tagname::2.1.${PATCH}" + echo "::set-output name=tagname::2.1.${PATCH} + echo "::set-output name=branch::${GITHUB_REF#refs/heads/}" + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -36,5 +38,5 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} tag: ${{ steps.compute-tag.outputs.tagname }} - commit: main + commit: ${{ steps.compute-tag.outputs.branch }} artifacts: './progit.epub,./progit.mobi,./progit.pdf,./progit.html'