Merge branch 'RollingPaper42:main' into main #13
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: Sync and merge upstream repository | |
on: | |
workflow_dispatch: | |
schedule: "*/5 * * * *" #Runs at 8:00 UTC(5:00 in Korea) every day. | |
jobs: | |
merge: | |
runs-on: ubuntu-latest | |
steps: | |
- uses: actions/checkout@v2 | |
- name: Merge upstream | |
run: | | |
git config --global user.name 'arkingco' | |
git config --global user.email 'arkingco@gmail.com' | |
# "git checkout master" is unnecessary, already here by default | |
git pull --unshallow # this option is very important, you would get | |
# complains about unrelated histories without it. | |
# (but actions/checkout@v2 can also be instructed | |
# to fetch all git depth right from the start) | |
git remote add upstream https://github.com/RollingPaper42/Front-End.git | |
git fetch upstream | |
git checkout main | |
git merge -Xtheirs upstream/main | |
git push origin main | |
# etc |