diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33097d8..2e86ba0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,7 @@ jobs: else echo "::set-output name=releaseVersion::${{ steps.readVersion.outputs.version }}" fi + create-tag: needs: calculate-version runs-on: ubuntu-latest @@ -122,10 +123,12 @@ jobs: git checkout develop git merge master -Xtheirs --allow-unrelated-histories echo "${{ steps.bumpSnapshotVersion.outputs.next-version }}-SNAPSHOT" > ${{ env.versionFileName }} + echo "patch" > ${{ env.versionFragmentFileName }} git status git add ${{ env.versionFileName }} git commit -m "${{ needs.calculate-version.outputs.releaseVersion }} -> ${{ steps.bumpSnapshotVersion.outputs.next-version }}-SNAPSHOT" git push origin develop + create-release: needs: [calculate-version, create-tag] runs-on: ubuntu-latest