Merge pull request #206 from OpenTerrace/development #113
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
| # This workflow will merge the main branch back to the development branch when a push is made to the main branch. This is in order to keep the development branch up-to-date with the main branch. | |
| name: Merge main back to dev branch | |
| on: | |
| push: | |
| branches: | |
| - main | |
| jobs: | |
| merge-master-back-to-dev: | |
| name: Merge main (and tags) back to dev branch | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Set Git config | |
| uses: actions/checkout@v4 | |
| - name: Merge main back to dev | |
| run: | | |
| git config --local user.email "actions@github.com" | |
| git config --local user.name "Github Actions" | |
| git fetch --unshallow | |
| git checkout development | |
| git pull | |
| git merge --no-ff main -m "Auto-merge main back to dev" | |
| git push |