Merge pull request #2780 from WolvenKit/manavortex-patch-1 #39
This file contains hidden or 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 main into dev | |
| on: | |
| push: | |
| branches: | |
| - main | |
| jobs: | |
| merge: | |
| if: github.event.pull_request.merged == true || github.event_name == 'push' | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout target branch (dev) | |
| uses: actions/checkout@v4 | |
| with: | |
| ref: dev | |
| fetch-depth: 0 | |
| - name: Configure Git | |
| run: | | |
| git config user.name "github-actions[bot]" | |
| git config user.email "github-actions[bot]@users.noreply.github.com" | |
| - name: Fetch source branch (main) | |
| run: git fetch origin main:main | |
| - name: Merge main into dev | |
| run: | | |
| git checkout dev | |
| git merge main --no-edit | |
| - name: Push changes | |
| run: git push origin dev | |
| env: | |
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |