Skip to content

"Parent check" improvements (support for backport branches + "recursive" check) #1077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thbar wants to merge 2 commits into
base: v2.0
Choose a base branch
from
Open

"Parent check" improvements (support for backport branches + "recursive" check) #1077

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5f8214
v3.0-wip must be up-to-date from v2.0 now (in addition to v2.1-wip)
thbar Sep 19, 2026
d650c6a
Make sure backport branches are not blocked
thbar Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions .github/workflows/check-parent-branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Block PRs targeting wip branches (v2.1-wip, v3.0-wip) when they are
# behind their parent branch (v2.0 and v2.1-wip respectively).
# behind their parent branches (v2.0, and v2.1-wip + v2.0 respectively).
# This prevents unpropagated commits from accumulating, which leads to
# costly backports of many commits generating large conflicts.
# See https://github.com/TransmodelEcosystem/NeTEx/issues/982
Expand All @@ -21,13 +21,23 @@ jobs:
- name: Verify base branch contains all parent commits
run: |
case "${{ github.base_ref }}" in
v2.1-wip) parent=v2.0 ;;
v3.0-wip) parent=v2.1-wip ;;
v2.1-wip) parents="v2.0" ;;
v3.0-wip) parents="v2.1-wip v2.0" ;;
esac

behind=$(git rev-list --count "origin/${{ github.base_ref }}..origin/$parent")
if [ "$behind" -gt 0 ]; then
echo "::error::${{ github.base_ref }} is $behind commit(s) behind $parent. Merge $parent into ${{ github.base_ref }} first."
git log --oneline "origin/${{ github.base_ref }}..origin/$parent"
exit 1
fi
target="origin/${{ github.base_ref }}"
pr="${{ github.event.pull_request.head.sha }}"

# Count the commits of the target's parent branch (e.g. v2.0 for
# v2.1-wip) found neither in the target branch nor in this PR. An
# ordinary PR does not bring them in, so it stays blocked while the
# target lags behind. A backport PR does, so it is not blocked by
# the very lag it fixes.
for parent in $parents; do
behind=$(git rev-list --count "origin/$parent" --not "$target" "$pr")
if [ "$behind" -gt 0 ]; then
echo "::error::${{ github.base_ref }} is $behind commit(s) behind $parent. Merge $parent into ${{ github.base_ref }} first."
git log --oneline "origin/$parent" --not "$target" "$pr"
exit 1
fi
done
Loading