Skip to content

Commit 1734eb1

Browse files
authored
add workflow to autoupdate develop branch (#312)
1 parent 06b85ef commit 1734eb1

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Merge master into develop
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
types:
8+
- closed
9+
10+
jobs:
11+
merge-master-back-to-develop:
12+
if: github.event.pull_request.merged == true
13+
timeout-minutes: 5
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
- name: Merge master back to develop
18+
run: |
19+
git config --local user.email "[email protected]"
20+
git config --local user.name "Github Actions"
21+
git fetch --unshallow
22+
git checkout develop
23+
git status
24+
git merge --no-ff --allow-unrelated-histories origin/master -m "Auto-merge master back to develop"
25+
git push

0 commit comments

Comments
 (0)