Skip to content

Commit 0b27760

Browse files
committed
change merge action
1 parent ea338ea commit 0b27760

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

.github/workflows/gh-pages-deploy.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ jobs:
2525
- name: Build
2626
run: npm run build
2727

28-
- name: Merge from master
29-
run: git checkout gh-pages && git merge master
28+
- name: Merge master -> gh-pages
29+
uses: devmasx/merge-branch@master
30+
with:
31+
type: now
32+
from_branch: master
33+
target_branch: gh-pages
34+
github_token: ${{ secrets.GITHUB_TOKEN }}
3035

3136
- name: Deploy to GitHub Pages
3237
uses: peaceiris/actions-gh-pages@v3

0 commit comments

Comments
 (0)