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.

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

Fixes #2114 - Add Shenandoah for Java 11 builds. #2125

Merged
merged 4 commits into from
Oct 13, 2020

Conversation

karianna
Copy link
Contributor

@karianna karianna commented Oct 7, 2020

As Shenandoah is ready for production in 16, I'm assuming the flag is not required there.

@karianna karianna linked an issue Oct 7, 2020 that may be closed by this pull request
@karianna karianna changed the title Fixes #2114 Fixes #2114 - Add Shenandoah for Java 11 builds. Oct 7, 2020
@karianna karianna added this to the October 2020 milestone Oct 7, 2020
@karianna karianna added the bug Issues that are problems in the code as reported by the community label Oct 7, 2020
@karianna karianna requested review from sxa and gdams October 8, 2020 08:18
gdams
gdams previously requested changes Oct 8, 2020
Copy link
Member

@gdams gdams left a comment

Choose a reason for hiding this comment

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

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

The location for changes such as this is something we need to discuss really. I came across it when putting this section of the FAQ together as things are currently in one of three places. Which to use depends on who we want to be affected and to me knowledge we've avoided being clear on where changes should be made which has already lead to confusion in the past. Quick summary:

Location Impact
groovy files (as per this PR) Only when run through our jenkins pipelines
platform-specific-configurations scripts Those using build-farm/make-adopt-build-farm.sh (inc. our pipelines) - should be stuff specific to our machines
build.sh Anyone (including end users) who are running makejdk-any-platform.sh

So it depends what we want the last line of those to be. If it's to allow users to replicate the adopt builds with the same configuration options as us as far as possible, then I think it ought to be in build.sh but if we want it to be optional for users building it themselves then the jenkins pipelines aren't a bad choice. But we should really make it clear for new people to the project where changes should be made e.g. via an update to the FAQ.

To be clear, I'm ok with this going in as-is for now, or in build.sh (which is why this is a comment rather than an explicit approve/reject for now) but let's make sure we clarify for the future (I'll spin off another issue for it to ensure we get consensus - as any outcome from that should include tidying up where things are currently defined)

@sxa
Copy link
Member

sxa commented Oct 8, 2020

(Side note: Is this really a bug as opposed to an enhancement?)

@adoptopenjdk-github-bot
Copy link
Contributor

🟠 PR TESTER RESULT 🟠

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

@karianna karianna added enhancement Issues that enhance the code or documentation of the repo in any way and removed bug Issues that are problems in the code as reported by the community labels Oct 8, 2020
@karianna
Copy link
Contributor Author

@gdams I've given that a go, I'm not sure if the whitespace changes my IDE enforced will mean I need to redo this PR, let me know.

@karianna karianna requested a review from gdams October 12, 2020 16:48
sbin/build.sh Outdated Show resolved Hide resolved
@karianna
Copy link
Contributor Author

@sxa fixes in place.

@karianna karianna requested a review from sxa October 12, 2020 17:49
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

Unless I've missed something in amongst all the whitespace adjustments this looks ok to me now :-)

@adoptopenjdk-github-bot
Copy link
Contributor

🟠 PR TESTER RESULT 🟠

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

@karianna
Copy link
Contributor Author

run tests

@adoptopenjdk-github-bot
Copy link
Contributor

🟠 PR TESTER RESULT 🟠

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

@karianna
Copy link
Contributor Author

run tests

sbin/build.sh Outdated Show resolved Hide resolved
@aahlenst
Copy link
Contributor

Can we do something to prevent accidental whitespace changes in the future? Terrible to review.

@adoptopenjdk-github-bot
Copy link
Contributor

🟢 PR TESTER RESULT 🟢

✅ All pipelines passed! ✅

@karianna
Copy link
Contributor Author

Can we do something to prevent accidental whitespace changes in the future? Terrible to review.

Yeah I need to change my IDE to 'not do that', apologies!

@karianna karianna dismissed gdams’s stale review October 13, 2020 21:43

Concerns addressed (changes now in build.sh)

@karianna karianna merged commit 8b97f43 into adoptium:master Oct 13, 2020
@adoptopenjdk-github-bot
Copy link
Contributor

🟠 PR TESTER RESULT 🟠

❎ Some pipelines failed or the job was aborted! ❎
See the pipeline-build-check below for more information...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Issues that enhance the code or documentation of the repo in any way
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build JDK11u 11.0.9 (or a variant) with Shenandoah
6 participants