Skip to content

Commit d7acdd2

Browse files
authored
Merge pull request #247 from OriginTrail/add-auto-merge-workflow
add automatic merge
2 parents 9e8e359 + 28f613c commit d7acdd2

File tree

1 file changed

+31
-0
lines changed

1 file changed

+31
-0
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Auto Merge v8/develop into Test_Publish_Query
2+
3+
on:
4+
push:
5+
branches:
6+
- v8/develop
7+
8+
jobs:
9+
merge-develop-into-feature:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout target branch (Test_Publish_Query)
14+
uses: actions/checkout@v3
15+
with:
16+
ref: Test_Publish_Query
17+
token: ${{ secrets.GITHUB_TOKEN }}
18+
19+
- name: Set up Git identity
20+
run: |
21+
git config user.name "github-actions[bot]"
22+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
23+
24+
- name: Fetch latest v8/develop
25+
run: git fetch origin v8/develop
26+
27+
- name: Merge v8/develop into Test_Publish_Query
28+
run: git merge origin/v8/develop --no-edit || true
29+
30+
- name: Push updated branch
31+
run: git push origin HEAD:Test_Publish_Query

0 commit comments

Comments
 (0)