Merge release to master #30063
Merged
Merge release to master #30063
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
Make sure to write the raw vendor in case we don't recognise the vendor. Previously if we found a JVM with an unknown vendor, we would write UNKNOWN as the vendor, and then fail when checking if that JVM was compatible. Also require isolated daemons for SupportedBuildJvmVersionIntegrationTest since before it was possible that the test picked up a compatible daemon from another test but with a different java home. We need are checking that the java home configured via installation paths is the same as the java home used by the daemon. It is a bit weird that the launcher will pick a running daemon started with a jvm that is not in its list of discovered JVMs, but as long as that happens, we need isolated daemons
Fixes gradle/gradle-private#4275 In the past, every Gradle invocation started via infrastructure was injected a default `-Xmx1024m` via `GRADLE_OPTS`. This is not enough for `sourceZipContents`, which builds Gradle from source. We'll remove these implciti JVM args because Gradle has its own JVM settings in `gradle.properties`.
cobexer
approved these changes
Jul 31, 2024
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.
To get a fix for #30060