Skip to content

Commit

Permalink
Add github action to check if your branch is up to date
Browse files Browse the repository at this point in the history
Check on PRs only

Fix action trigger

clean up variables, fetch origin
  • Loading branch information
seanmcgary committed Nov 22, 2024
1 parent 9a9953a commit 5b9118e
Showing 1 changed file with 33 additions and 0 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/check-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: check-pr-merge
on:
pull_request:
types:
- opened
- synchronize
- reopened
branches:
- master
- "release/*"
jobs:
check-merge:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Check if branch is up to date
env:
BASE_REF: ${{ github.base_ref }}
run: |
baseRef="origin/${BASE_REF}"
echo "Targeting '$baseRef'"
git fetch origin
res=$(git --no-pager log HEAD..$baseRef --oneline)
if [[ -z "$res" ]]; then
echo "Branch is up to date with master"
else
echo "Branch is not up to date with master"
echo "Please rebase your branch"
exit 1
fi

0 comments on commit 5b9118e

Please sign in to comment.