We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent e65ce0d commit e3b0c39Copy full SHA for e3b0c39
.github/workflows/branches.yml
@@ -1,4 +1,4 @@
1
-name: Build Documents
+name: Merge Branches
2
3
on:
4
pull_request:
@@ -12,11 +12,15 @@ on:
12
jobs:
13
merge:
14
runs-on: ubuntu-latest
15
- if: github.event.pull_request.merged == true || github.event.release.action == 'released'
+ if: github.event.pull_request.merged == true || github.event.action == 'published'
16
steps:
17
- - uses: actions/checkout@v4
18
- - name: Merge dev to main
+ - name: Checkout main branch
+ uses: actions/checkout@v4
19
+ with:
20
+ ref: 'main'
21
+ fetch-depth: 0
22
+
23
+ - name: Merge dev to main branch
24
run: |
- git checkout main
- git pull --no-rebase origin dev
- git push origin main
25
+ git merge --ff-only -- origin/dev
26
+ git push
0 commit comments