parent
f18222105e
commit
97afc4abf6
1 changed files with 37 additions and 0 deletions
@ -0,0 +1,37 @@ |
|||||||
|
name: Automerge |
||||||
|
|
||||||
|
on: |
||||||
|
push: |
||||||
|
branches: |
||||||
|
- 'work-in-progress' |
||||||
|
|
||||||
|
|
||||||
|
env: |
||||||
|
# replace "github_username" with your GitHub username |
||||||
|
# replace "github.com/username/repo.git" with your GitHub repo path |
||||||
|
# do NOT replace ${{secrets.GITHUB_TOKEN}}, GitHub will take care of it |
||||||
|
MY_REPO: https://taoria:${{secrets.GITHUB_TOKEN}}@github.com/taoria/T-Node.git |
||||||
|
|
||||||
|
# replace "long-lived_branch_name" with your branch name |
||||||
|
MY_BRANCH: work-in-progress |
||||||
|
|
||||||
|
# replace it with the path to master repo |
||||||
|
MASTER_REPO: https://github.com/taoria/T-Node.git |
||||||
|
|
||||||
|
# replace "master" with your master branch name |
||||||
|
MASTER_BRANCH: main |
||||||
|
|
||||||
|
jobs: |
||||||
|
merge: |
||||||
|
runs-on: ubuntu-latest |
||||||
|
|
||||||
|
steps: |
||||||
|
- name: Merge with master |
||||||
|
run: | |
||||||
|
git clone ${{env.MY_REPO}} -b ${{env.MY_BRANCH}} tmp |
||||||
|
cd tmp |
||||||
|
git config user.name "Automerge Bot" |
||||||
|
git config user.email "bot@example.com" |
||||||
|
git config pull.rebase false |
||||||
|
git pull ${{env.MASTER_REPO}} ${{env.MASTER_BRANCH}} |
||||||
|
git push |
Loading…
Reference in new issue