Skip to content

Commit 717a8f3

Browse files
authored
[fix][CI] Fix auto merge action (#367)
* Added nightly merge workflow * Fixed branch names * Change nightly merge to git script * Delete nightly merge and remove git fetch
1 parent deb8ce8 commit 717a8f3

File tree

2 files changed

+29
-26
lines changed

2 files changed

+29
-26
lines changed

.github/workflows/automerge.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: 'Auto Merge GH-Pages'
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
merge-main-to-gh-pages:
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0 # Full clone necessary for proper merge
18+
19+
- name: Set git config
20+
run: |
21+
git config --local user.email "[email protected]"
22+
git config --local user.name "Github Actions"
23+
24+
- name: Merge main into gh-pages
25+
run: |
26+
git checkout gh-pages
27+
git pull
28+
git merge --no-ff main -m "Automatically merge main into gh-pages"
29+
git push

.github/workflows/nightly-merge.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)