Skip to content

Commit bb0ee85

Browse files
committed
chore: change sync release to REBASE instead of merge
1 parent 84d6e8a commit bb0ee85

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

.github/workflows/merge-release.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ jobs:
66
merge-master:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@master
10-
11-
- name: Merge master -> release
12-
uses: devmasx/[email protected]
13-
with:
14-
type: now
15-
from_branch: master
16-
target_branch: release
17-
github_token: ${{ github.token }}
9+
- uses: actions/checkout@v2
10+
- name: Setup git config
11+
run: |
12+
git config user.name "GitHub Actions Bot"
13+
git config user.email "<>"
14+
- name: Rebase release on master
15+
run: |
16+
git checkout master
17+
git pull
18+
git checkout release
19+
git pull
20+
git rebase master
21+
git push origin release

0 commit comments

Comments
 (0)