Skip to content

Commit d3e1e63

Browse files
committed
fix(workflow): merge two release commits into one
1 parent eebc830 commit d3e1e63

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/release.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,18 @@ jobs:
3333
with:
3434
github-token: ${{ secrets.GITHUB_TOKEN }}
3535
skip-version-file: true
36+
skip-commit: true
37+
skip-tag: true
38+
git-push: false
3639

37-
- name: Update pom.xml version
40+
- name: Update pom.xml version and push changes
3841
if: steps.changelog.outputs.skipped == 'false'
3942
run: |
4043
mvn versions:set -DnewVersion=${{ steps.changelog.outputs.version }}
4144
mvn versions:commit
42-
git config --global user.name 'VoperAD'
43-
git config --global user.email 'VoperAD@users.noreply.github.com'
44-
git commit -am "chore: bump project version to ${{ steps.changelog.outputs.version }} [skip ci]"
45-
git push
45+
git commit -am "chore(release): version ${{ steps.changelog.outputs.tag }} [skip ci]"
46+
git tag -a ${{ steps.changelog.outputs.tag }} -m "${{ steps.changelog.outputs.tag }}"
47+
git push origin main --follow-tags
4648
4749
- name: Generate jar
4850
if: steps.changelog.outputs.skipped == 'false'

0 commit comments

Comments
 (0)