Add OS/architecture classifier to distributions#37881
Merged
rjernst merged 9 commits intoelastic:masterfrom Jan 29, 2019
Merged
Add OS/architecture classifier to distributions#37881rjernst merged 9 commits intoelastic:masterfrom
rjernst merged 9 commits intoelastic:masterfrom
Conversation
This commit adds classifiers to the distributions indicating the OS (for archives) and platform. The current OSes are for windows, darwin (ie macos) and linux. This change will allow future OS/architecture specific changes to the distributions. Note the docs using distribution links have been updated, but will be reworked in a followup to make OS specific instructions for the archives.
Collaborator
|
Pinging @elastic/es-core-infra |
Member
Author
|
@elasticmachine test this please |
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
jasontedor
approved these changes
Jan 28, 2019
Member
jasontedor
left a comment
There was a problem hiding this comment.
Looks good. Just one request on not abbreviating some variable names; no need for another round.
distribution/bwc/build.gradle
Outdated
| String artifactFileName = artifactFile.name | ||
| String artifactName = artifactFileName.contains('oss') ? 'elasticsearch-oss' : 'elasticsearch' | ||
| String suffix = artifactFile.toString()[-3..-1] | ||
| int archNdx = artifactFileName.indexOf('x86_64') |
Member
There was a problem hiding this comment.
Maybe Index instead of Ndx please?
distribution/bwc/build.gradle
Outdated
| String classifier = "" | ||
| String extension = projectName | ||
| if (bwcVersion.onOrAfter('7.0.0') && (projectName.contains('zip') || projectName.contains('tar'))) { | ||
| int ndx = projectName.indexOf('-') |
distribution/bwc/build.gradle
Outdated
| int archNdx = artifactFileName.indexOf('x86_64') | ||
| String classifier = '' | ||
| if (archNdx != -1) { | ||
| int osNdx = artifactFileName.lastIndexOf('-', archNdx - 2) |
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
2 similar comments
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
1 similar comment
Member
Author
|
@elasticmachine run elasticsearch-ci/1 |
tvernum
added a commit
to tvernum/elasticsearch
that referenced
this pull request
Jan 30, 2019
tvernum
added a commit
that referenced
this pull request
Jan 30, 2019
The distribution now includes a platform specific classifier that the docker build wasn't taking into account. Relates: #37881
danielmitterdorfer
added a commit
to elastic/rally-teams
that referenced
this pull request
Jan 30, 2019
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This commit adds classifiers to the distributions indicating the
OS (for archives) and platform. The current OSes are for windows, darwin (ie
macos) and linux. This change will allow future OS/architecture specific
changes to the distributions. Note the docs using distribution links
have been updated, but will be reworked in a followup to make OS
specific instructions for the archives.