Merge branch 'main' of github.com:simul/Platform #22
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
name: Merge main into console | |
#https://stackoverflow.com/questions/35445186/can-github-automatically-merge-branches | |
on: | |
push: | |
branches: | |
- main | |
workflow_dispatch: | |
env: | |
# do NOT replace ${{secrets.GITHUB_TOKEN}}, GitHub will take care of it | |
MY_REPO: https://simul-build:${{secrets.GITHUB_TOKEN}}@github.com/simul/Platform.git | |
MY_BRANCH: console | |
MAIN_REPO: https://github.com/simul/Platform.git | |
MAIN_BRANCH: main | |
jobs: | |
merge: | |
runs-on: ubuntu-latest | |
steps: | |
- name: Merge main into console | |
run: | | |
git clone ${{env.MY_REPO}} -b ${{env.MY_BRANCH}} tmp | |
cd tmp | |
git config user.name "Automerge Bot" | |
git config user.email "[email protected]" | |
git config pull.rebase false | |
git merge origin/${{env.MAIN_BRANCH}} | |
git push |