Skip to content

Commit

Permalink
Added github actions for checking merge compatibility with foss-master
Browse files Browse the repository at this point in the history
  • Loading branch information
SankethBK committed Oct 20, 2023
1 parent 2127d75 commit d920a22
Showing 1 changed file with 29 additions and 0 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/check_merge_to_foss_master.yml
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

0 comments on commit d920a22

Please sign in to comment.