tweak install instructions around inital setup (#845) #1
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 develop | |
on: | |
push: | |
branches: [latest] | |
defaults: | |
run: | |
shell: bash | |
jobs: | |
sync: | |
runs-on: ubuntu-latest | |
steps: | |
- name: checkout | |
uses: actions/checkout@v3 | |
with: | |
token: ${{ secrets.OSC_ROBOT_GH_PUB_REPO_TOKEN }} | |
fetch-depth: 0 | |
- name: Merge Branches | |
run: | | |
git config --global user.name ${{ secrets.OSC_ROBOT_GH_USER }} | |
git config --global user.email ${{ secrets.OSC_ROBOT_GH_USER_EMAIL }} | |
git fetch | |
git checkout latest | |
git pull | |
git checkout develop | |
git pull | |
git merge latest | |
# note that this shouldn't run if 'merge branches' fails, which it will happen when | |
# there are merge conflicts. | |
- name: Sync develop | |
run: | | |
git push |