pull in changes from next to fix double error message (#439) #13
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 uses the action to merge special branches on push | |
| # https://github.com/marketplace/actions/merge-branch | |
| name: Merge protected branches | |
| on: | |
| workflow_dispatch: | |
| push: | |
| branches: [staging] | |
| jobs: | |
| merge-staging-into-next: | |
| runs-on: ubuntu-latest | |
| if: ${{ github.ref_name == 'staging' }} | |
| steps: | |
| - uses: actions/checkout@v4 | |
| - name: Merge staging into next | |
| uses: devmasx/merge-branch@1.4.0 | |
| with: | |
| type: now | |
| target_branch: next | |
| message: Merge staging into next | |
| github_token: ${{ secrets.GITHUB_TOKEN }} |