-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CI: Add workflow to enforce rebase before merge
- Loading branch information
Xavier Chapron
committed
Jan 11, 2024
1 parent
6b45462
commit 666b808
Showing
2 changed files
with
37 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,31 @@ | ||
name: Force rebased | ||
|
||
on: [pull_request] | ||
|
||
jobs: | ||
force-rebase: | ||
runs-on: ubuntu-latest | ||
steps: | ||
|
||
- name: 'PR commits + 1' | ||
id: pr_commits | ||
run: echo "pr_fetch_depth=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> "${GITHUB_OUTPUT}" | ||
|
||
- name: 'Checkout PR branch and all PR commits' | ||
uses: actions/checkout@v4 | ||
with: | ||
ref: ${{ github.event.pull_request.head.sha }} | ||
fetch-depth: ${{ steps.pr_commits.outputs.pr_fetch_depth }} | ||
|
||
- name: Check if PR branch is rebased on target branch | ||
shell: bash | ||
run: | | ||
git merge-base --is-ancestor ${{ github.event.pull_request.base.sha }} HEAD | ||
- name: Check if PR branch contains merge commits | ||
shell: bash | ||
run: | | ||
merges=$(git log --oneline HEAD~${{ github.event.pull_request.commits }}...HEAD --merges ); \ | ||
echo "--- Merges ---"; \ | ||
echo ${merges}; \ | ||
[[ -z "${merges}" ]] |
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