Update tips-and-tricks.rst #25
Workflow file for this run
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: Auto-update dev branch | |
on: | |
pull_request: | |
branches: [main] | |
types: [closed] | |
jobs: | |
update-branchs: | |
if: github.event.pull_request.merged == true | |
timeout-minutes: 5 | |
runs-on: ubuntu-latest | |
steps: | |
- uses: actions/checkout@v4 | |
- name: Set Git config | |
run: | | |
git config --local user.email "actions@github.com" | |
git config --local user.name "Github Actions" | |
git fetch --unshallow | |
- name: Merge main back to dev | |
continue-on-error: true | |
run: | | |
git checkout dev | |
git pull | |
git merge main --ff -m "Auto-update dev from main" && git push || (echo "Unable to automatically merge dev" && git merge --abort; exit 1) | |
- name: Merge main back to dev-wrapper | |
continue-on-error: true | |
run: | | |
git checkout dev-wrapper | |
git pull | |
git merge main --ff -m "Auto-update dev-wrapper from main" && git push || (echo "Unable to automatically merge dev-wrapper" && git merge --abort; exit 1) | |
- name: Merge main back to dev-images | |
continue-on-error: true | |
run: | | |
git checkout dev-images | |
git pull | |
git merge main --ff -m "Auto-update dev-images from main" && git push || (echo "Unable to automatically merge dev-images" && git merge --abort; exit 1) |