-
Notifications
You must be signed in to change notification settings - Fork 25.5k
Use PR base branch when checking transport version modifications #136220
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.
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
Merged
rjernst
merged 6 commits into
elastic:main
from
rjernst:transport/upstream_ref_release_branch
Oct 10, 2025
Merged
Use PR base branch when checking transport version modifications #136220
rjernst
merged 6 commits into
elastic:main
from
rjernst:transport/upstream_ref_release_branch
Oct 10, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Pinging @elastic/es-core-infra (Team:Core/Infra) |
mark-vieira
approved these changes
Oct 8, 2025
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.
This was referenced Oct 10, 2025
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
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.