Skip to content

Backport jruby.sh from JRuby 10#8754

Merged
headius merged 2 commits intojruby:jruby-9.4from
headius:backport_launcher
Apr 8, 2025
Merged

Backport jruby.sh from JRuby 10#8754
headius merged 2 commits intojruby:jruby-9.4from
headius:backport_launcher

Conversation

@headius
Copy link
Member

@headius headius commented Apr 8, 2025

This brings the latest launcher from JRuby 10 back to JRuby 9.4, with all AppCDS and Java detection intact. JRuby 9.4 will use its bin/.java-version file to indicate a minimum Java version of 8.

@headius headius added this to the JRuby 9.4.13.0 milestone Apr 8, 2025
@headius headius requested a review from mrnoname1000 April 8, 2025 05:36
@headius headius force-pushed the backport_launcher branch 5 times, most recently from 90bf4ca to 0390ded Compare April 8, 2025 06:09
@headius
Copy link
Member Author

headius commented Apr 8, 2025

Windows failed in the "REMOVE ME" commit because it's trying to install the jruby-launcher gem on Windows without us ever making that work (build tools on Windows will require tweaks to the gem to install live). Can be ignored, because that commit will not be merged in with this.

@headius headius force-pushed the backport_launcher branch from 4f96278 to d5c5306 Compare April 8, 2025 21:49
* Check for Java required Java version using .java-version file.
* Interpret "1.8" version as "8".
* Handle missing release file by assuming Java 8.
* Handle missing .java-version file by assuming Java 8 minimum.
* Show detected Java version in error.
@headius headius force-pushed the backport_launcher branch from d5c5306 to 867b111 Compare April 8, 2025 21:57
@headius headius merged commit 16019b5 into jruby:jruby-9.4 Apr 8, 2025
95 of 96 checks passed
@headius headius deleted the backport_launcher branch April 8, 2025 22:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant