Skip to content

Backport #1074 to v2.1-wip - #1076

Open
thbar wants to merge 2 commits into
v2.1-wipfrom
backport/1074-to-v2.1-wip
Open

thbar wants to merge 2 commits into
v2.1-wipfrom
backport/1074-to-v2.1-wip

Conversation

@thbar

@thbar thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor

Replaces:

Reason: the backport in #1075 triggers a git conflict which cannot be solved via web UI.

Copy pasting @TuThoThai description:

Current PR contains the below changes:

  • Add "failing examples" to CI
  • Remove incorrect example
  • Make failure check more narrow
  • Use more structured input for should_fail (more readable)

This PR is the backport of its single commit into v2.1-wip

* Add "failing examples" to CI

* Remove incorrect example

* Make failure check more narrow

* Use more structured input for should_fail (more readable)
@thbar

thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor Author

Chicken and egg issue: backport PRs should be excluded from the parent check. I'll come back to that later @TuThoThai

thbar added a commit that referenced this pull request Sep 19, 2026
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.
@thbar

thbar commented Sep 19, 2026

Copy link
Copy Markdown
Contributor Author

Backport branches were not supported correctly yet by the parent check. I'm fixing it here:

(but the real-test will be once #1077 is merged in, to update here and verify if things go green).

cc @TuThoThai

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

Copy link
Copy Markdown
Contributor

Needs to be rechecked once we merge #1083 to ensure there is no conflict in the CI

thbar added a commit that referenced this pull request Oct 8, 2026
…ve" check) (#1077)

* v3.0-wip must be up-to-date from v2.0 now (in addition to v2.1-wip)
* Make sure backport branches are not blocked
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.
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.

2 participants