Merge branch 'master' into master #6
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: Backmerge from master | |
| on: | |
| push: | |
| branches: | |
| - master | |
| jobs: | |
| merge-master-back-to-qa: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v2 | |
| with: | |
| token: ${{ secrets.WORKFLOW_TOKEN }} | |
| - name: Set Git config | |
| run: | | |
| git config --local user.email "[email protected]" | |
| git config --local user.name "Github Actions" | |
| - name: Merge master back to qa | |
| run: | | |
| git fetch --unshallow | |
| git checkout qa | |
| git pull | |
| git merge --no-ff master -m "Auto-merge master back to qa" | |
| git push |