Merge to Foss master #2
Workflow file for this run
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: Check merge to foss_master | |
| on: | |
| pull_request_review: | |
| types: [submitted] | |
| jobs: | |
| check-merge-compatibility-with-foss_master: | |
| if: github.event.review.state == 'approved' | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Checkout pull request head | |
| uses: actions/checkout@v2 | |
| with: | |
| ref: ${{ github.head_ref }} | |
| - name: Fetch foss_master | |
| run: git fetch origin foss_master | |
| - name: Rebase 'foss_master' with PR branch | |
| run: git rebase foss_master | |
| - name: Check for conflicts | |
| run: | | |
| if git diff --quiet; then | |
| echo "No merge conflicts found. Rebase successful." | |
| exit 0 | |
| else | |
| echo "Merge conflicts found. Rebase failed." | |
| exit 1 | |
| fi |