Skip to content

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

Merged
thbar merged 3 commits into
v2.0from
fix/parent-branch-check
Oct 8, 2026
Merged

thbar merged 3 commits into
v2.0from
fix/parent-branch-check

Conversation

@thbar

@thbar thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor

In this PR:

  1. Make sure that backport PRs (such as Backport #1074 to v2.1-wip #1076) are not blocked by the parent check
  • Before: only the target branch was compared to its parent (commits brought by the PR itself were not included in the comparison, causing backport branches to be blocked).
  • After: commits brought in by the PR itself are included in the comparison.
  1. Make sure that v3.0-wip is "recursively" up-to-date from v2.0
  • Before: the test would be green if v3.0-wip is up-to-date from v2.1-wip, but v2.1-wip is not itself up-to-date from v2.0
  • After: both parents are checked

Testing

The script was run locally against the real merge refs of #1076 (passes), #1068 and #981 (still blocked while v2.1-wip is behind, pass once it is synced).

The first real run will be #1076, after v2.0 is merged into its branch again.

Before: only the target branch was compared to its parent, so backport PRs were blocked too (see #1076).
After: commits brought in by the PR itself are included in the comparison.

@TuThoThai TuThoThai left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this @thbar!

@thbar

thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor Author

A good way to review is to go commit by commit:

@TuThoThai TuThoThai added the CI & Backport For anything related to CI and Backport actions label Sep 28, 2026
@TuThoThai TuThoThai added this to the netex_2.0 milestone Sep 28, 2026
@TuThoThai

Copy link
Copy Markdown
Contributor

@skinkie and @ue71603, would love your review

Then, @thbar and I can add it to the list of commits to backport to v2.1-wip and other related branches

@thbar

thbar commented Oct 8, 2026

Copy link
Copy Markdown
Contributor Author

Thanks @ue71603 & @TuThoThai!

@thbar
thbar merged commit 8c01035 into v2.0 Oct 8, 2026
1 check passed
@thbar
thbar deleted the fix/parent-branch-check branch October 8, 2026 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI & Backport For anything related to CI and Backport actions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants