Skip to content

Commit 31bbab7

Browse files
committed
chore: add workflow for main branch auto merge
1 parent 3a035e9 commit 31bbab7

File tree

3 files changed

+24
-0
lines changed

3 files changed

+24
-0
lines changed

.github/workflows/branches.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Build Documents
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- 'dev'
7+
types: [ closed ]
8+
release:
9+
types:
10+
- published
11+
12+
jobs:
13+
merge:
14+
runs-on: ubuntu-latest
15+
if: github.event.pull_request.merged == true || github.event.release.action == 'released'
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Merge dev to main
19+
run: |
20+
git checkout main
21+
git pull --no-rebase origin dev
22+
git push origin main

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- '*'
7+
- '!main'
78
paths:
89
- "app/**/*.js"
910
- "app/**/*.vue"

.github/workflows/documents.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- '*'
7+
- '!main'
78
paths:
89
- "docs/**/*.js"
910
- "docs/**/*.ts"

0 commit comments

Comments
 (0)