Change upstreamRef override to baseRef override #135807
Merged
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
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added
:Core/Infra/Core
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
mark-vieira
approved these changes
Oct 1, 2025
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Oct 1, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Oct 1, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Oct 1, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Oct 1, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 1, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added a commit
that referenced
this pull request
Oct 2, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added a commit
that referenced
this pull request
Oct 2, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
rjernst
added a commit
that referenced
this pull request
Oct 2, 2025
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches. This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When calculating the base git reference to read transport version resources from the upstream main ref must be known. Before we calculated the merge base this was overridden with a gradle property by tests and release tooling. However, in the case of release tooling we actually want to override the base ref directly so that it can be run on non-main branches.
This commit renames the upstreamRef gradle property to baseRef. It also renames the resources service methods to make clearer what they are reading: from the git (merge) base.