Merge pull request #38579 from peterfpeterson/38457_generate_export_h… #476
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: [ornl-next, release-next] | |
| jobs: | |
| merge-release-into-main: | |
| runs-on: ubuntu-latest | |
| if: ${{ github.ref_name == 'release-next' }} | |
| steps: | |
| - uses: actions/checkout@master | |
| - name: Merge release-next into main | |
| uses: devmasx/merge-branch@master | |
| with: | |
| type: now | |
| target_branch: main | |
| message: Merge release-next into main | |
| github_token: ${{ secrets.MANTID_BUILDER_TOKEN }} | |
| merge-ornl-into-main: | |
| runs-on: ubuntu-latest | |
| if: ${{ github.ref_name == 'ornl-next' }} | |
| steps: | |
| - uses: actions/checkout@master | |
| - name: Merge ornl-next into main | |
| uses: devmasx/merge-branch@master | |
| with: | |
| type: now | |
| target_branch: main | |
| message: Merge ornl-next into main | |
| github_token: ${{ secrets.MANTID_BUILDER_TOKEN }} |