Skip to content

Commit 72a118e

Browse files
committed
Follow up: automate relrease workflow
1 parent 98ab3a4 commit 72a118e

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

.github/workflows/bump-version.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,6 @@ jobs:
5454
5555
- name: Push commit
5656
run: |
57+
git fetch
58+
git rebase origin/master
5759
git push

.github/workflows/release.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ jobs:
5757
- name: Push commit
5858
shell: bash
5959
run: |
60+
git fetch
61+
git rebase origin/master
6062
git push
6163
6264
- name: Tag commit
@@ -69,6 +71,8 @@ jobs:
6971
shell: bash
7072
run: |
7173
VERSION=$(grep "webAuthn4JSpringSecurityVersion" gradle.properties | cut -d'=' -f2)
74+
git fetch
75+
git rebase origin/master
7276
git push origin "${VERSION}.RELEASE"
7377
7478

0 commit comments

Comments
 (0)