Skip to content

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Oct 10, 2025

Backports the following commits to 9.1:

…stic#136220)

Transport version validation relies on comparing the local state to the
"base" version of each file. The base can be calculcated in several
different context-dependent ways, but by default it compares to upstream
main to determine the merge base. In release branches this is incorrect
since it will find the point at with the release branch was created.

This commit adjusts the base ref to be relative to the PR base branch
when runnign in CI. When running locally on release branches these
modification checks are disabled since there is nothing to compare to.
@rjernst rjernst requested a review from a team as a code owner October 10, 2025 14:37
@rjernst rjernst added :Core/Infra/Core Core issues without another label >refactoring auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport Team:Core/Infra Meta label for core/infra team labels Oct 10, 2025
@elasticsearchmachine elasticsearchmachine merged commit b3458dc into elastic:9.1 Oct 10, 2025
36 checks passed
@rjernst rjernst deleted the backport/9.1/pr-136220 branch October 10, 2025 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport :Core/Infra/Core Core issues without another label >refactoring Team:Core/Infra Meta label for core/infra team v9.1.6

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants