Merge #96
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: Merge | |
| on: | |
| workflow_run: | |
| workflows: ["Publish"] | |
| types: [completed] | |
| jobs: | |
| Merge: | |
| runs-on: ubuntu-latest | |
| if: ${{ github.event.workflow_run.conclusion == 'success' }} | |
| steps: | |
| - name: Checkout repositiory | |
| uses: actions/checkout@v2 | |
| with: | |
| token: ${{ secrets.MACHINE_PAT }} | |
| fetch-depth: "0" | |
| ref: "develop" | |
| - name: Set Github credentials | |
| run: | | |
| git config user.name searchspring-machine | |
| git config user.email [email protected] | |
| - name: Merge main into develop branch | |
| run: | | |
| git merge -X theirs origin/main | |
| git push |