Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow for null versionData.patch for installer creation and tag sorting #2234

Merged
merged 2 commits into from
Nov 17, 2020
Merged

Allow for null versionData.patch for installer creation and tag sorting #2234

merged 2 commits into from
Nov 17, 2020

Conversation

andrew-m-leonard
Copy link
Contributor

Signed-off-by: Andrew Leonard anleonar@redhat.com

douph1
douph1 approved these changes Nov 16, 2020
View reviewed changes
Copy link
Contributor

@douph1 douph1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good

M-Davies
M-Davies previously requested changes Nov 16, 2020
View reviewed changes
pipelines/build/common/openjdk_build_pipeline.groovy Outdated Show resolved Hide resolved
@M-Davies M-Davies added bug Issues that are problems in the code as reported by the community installer Issues that relate to our installer jobs or installer repo labels Nov 16, 2020
@andrew-m-leonard
Copy link
Contributor Author

Installer now gets a patch of 0 if metadata does not contain a patch.

The ".patch" sorting I added wasn't quite right and hit a sort difference on Windows.
Changed the tag sort algo to add a .0 during the sort if no .patch was present, and also add a tailing "." so the reset of teh line is not used in the sort.

@andrew-m-leonard
Allow for null versionData.patch for installer and tag sorting
30a339d 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard andrew-m-leonard changed the title Allow for null versionData.patch for installer creation Allow for null versionData.patch for installer creation and tag sorting Nov 16, 2020
sxa
sxa previously requested changes Nov 16, 2020
View reviewed changes
sbin/build.sh Outdated Show resolved Hide resolved
@andrew-m-leonard @sxa
Update sbin/build.sh
1d80a84 
Co-authored-by: Stewart X Addison <6487691+sxa@users.noreply.github.com>
@andrew-m-leonard
Copy link
Contributor Author

andrew-m-leonard commented Nov 17, 2020 •
edited
Loading

Test build on Windows: https://ci.adoptopenjdk.net/view/work-in-progress/job/andrew-jdk11u-windows-x64-hotspot/13/

@andrew-m-leonard
Copy link
Contributor Author

@M-Davies @sxa i've updated the PR and tested on test build.
The problem was related to incorrectly optional sorting of the ".patch" that may or may not be present and the numeric collation ordering differences on Windows cygwin when the "+" was included in the 5th numeric sort field.

@andrew-m-leonard
Copy link
Contributor Author

Will merge once final test build completes successfully: https://ci.adoptopenjdk.net/view/work-in-progress/job/andrew-jdk11u-windows-x64-hotspot/13/

@andrew-m-leonard andrew-m-leonard merged commit a5bfc2d into adoptium:master Nov 17, 2020
@karianna karianna added this to the November 2020 milestone Nov 17, 2020
@andrew-m-leonard andrew-m-leonard mentioned this pull request Nov 18, 2020
Closed
This was referenced Nov 19, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sxa sxa sxa approved these changes

@M-Davies M-Davies M-Davies approved these changes

@douph1 douph1 douph1 approved these changes

Assignees
No one assigned
Labels
bug Issues that are problems in the code as reported by the community installer Issues that relate to our installer jobs or installer repo
Projects
None yet
Milestone
November 2020
Development

Successfully merging this pull request may close these issues.
5 participants
@andrew-m-leonard @sxa @M-Davies @douph1 @karianna