Skip to content

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Oct 8, 2025

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.

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 8, 2025 18:32
@rjernst rjernst added :Core/Infra/Core Core issues without another label >refactoring auto-backport Automatically create backport pull requests when merged v9.2.0 v8.19.6 v9.1.6 v9.0.9 v8.18.9 labels Oct 8, 2025
@rjernst rjernst requested a review from mark-vieira October 8, 2025 18:33
@elasticsearchmachine elasticsearchmachine added Team:Core/Infra Meta label for core/infra team v9.3.0 labels Oct 8, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@rjernst rjernst merged commit dbf4dcb into elastic:main Oct 10, 2025
34 checks passed
@rjernst rjernst deleted the transport/upstream_ref_release_branch branch October 10, 2025 14:35
rjernst added a commit to rjernst/elasticsearch that referenced this pull request Oct 10, 2025
…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 added a commit to rjernst/elasticsearch that referenced this pull request Oct 10, 2025
…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 added a commit to rjernst/elasticsearch that referenced this pull request Oct 10, 2025
…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 added a commit to rjernst/elasticsearch that referenced this pull request Oct 10, 2025
…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 added a commit to rjernst/elasticsearch that referenced this pull request Oct 10, 2025
…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.
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
9.2
8.19
9.1
9.0
8.18

elasticsearchmachine pushed a commit that referenced this pull request Oct 10, 2025
…6220) (#136406)

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.
elasticsearchmachine pushed a commit that referenced this pull request Oct 10, 2025
…6220) (#136404)

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged :Core/Infra/Core Core issues without another label >refactoring Team:Core/Infra Meta label for core/infra team v8.18.9 v8.19.6 v9.0.9 v9.1.6 v9.2.0 v9.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants