-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added github actions for checking merge compatibility with foss-master
- Loading branch information
Showing
1 changed file
with
29 additions
and
0 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
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 |