Standardize build distribution internals on os/architecture #105842
Merged
Conversation
This file contains 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
The build handles platform specific code which may be for arm or x86. Yet there are multiple ways to describe 64bit x86, and the build converts between the two in several places. This commit consolidates on the x64 nomenclature in most places, except where necessary (eg ML still uses x86_64). relates elastic#105715
|
Pinging @elastic/es-delivery (Team:Delivery) |
breskeby
reviewed
Feb 28, 2024
| @@ -65,42 +70,42 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla | |||
| distribution_archives { | |||
| integTestZip { | |||
| content { | |||
| archiveFiles(integTestModulesFiles, 'zip', null, 'x64', true) | |||
There was a problem hiding this comment.
I'd personally prefer to keep it explicit here if it's a test distribution or not and keep that parameter in archiveFiles.
mark-vieira
reviewed
Feb 28, 2024
distribution/build.gradle
Outdated
| if (os != null) { | ||
| if (architecture == 'x64') { | ||
| // ML platform dir uses the x86_64 nomenclature | ||
| architecture = 'x86_64' |
There was a problem hiding this comment.
Not a huge fan of overriding a local argument like this. In this case we don't use it again later in this closure but we could and that would cause funny behavior.
mark-vieira
approved these changes
Feb 28, 2024
rjernst
added
the
auto-merge
|
@rjernst can we backport this as well, at least to 8.13? |
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Feb 28, 2024
…105842) The build handles platform specific code which may be for arm or x86. Yet there are multiple ways to describe 64bit x86, and the build converts between the two in several places. This commit consolidates on the x64 nomenclature in most places, except where necessary (eg ML still uses x86_64). relates elastic#105715
elasticsearchmachine
pushed a commit
that referenced
this pull request
Feb 28, 2024
…#105846) The build handles platform specific code which may be for arm or x86. Yet there are multiple ways to describe 64bit x86, and the build converts between the two in several places. This commit consolidates on the x64 nomenclature in most places, except where necessary (eg ML still uses x86_64). relates #105715
idegtiarenko
pushed a commit
to idegtiarenko/elasticsearch
that referenced
this pull request
Mar 4, 2024
…105842) The build handles platform specific code which may be for arm or x86. Yet there are multiple ways to describe 64bit x86, and the build converts between the two in several places. This commit consolidates on the x64 nomenclature in most places, except where necessary (eg ML still uses x86_64). relates elastic#105715
fang-xing-esql
pushed a commit
to fang-xing-esql/Elasticsearch
that referenced
this pull request
Mar 8, 2024
…105842) The build handles platform specific code which may be for arm or x86. Yet there are multiple ways to describe 64bit x86, and the build converts between the two in several places. This commit consolidates on the x64 nomenclature in most places, except where necessary (eg ML still uses x86_64). relates elastic#105715
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.
The build handles platform specific code which may be for arm or x86. Yet there are multiple ways to describe 64bit x86, and the build converts between the two in several places. This commit consolidates on the x64 nomenclature in most places, except where necessary (eg ML still uses x86_64).
relates #105715