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

Fix bundled GraalVM path #7948

Conversation

4e6
Copy link
Contributor

@4e6 4e6 commented Oct 2, 2023

Pull Request Description

close #7871
close #7698

Changelog:

  • fix: the run script logic to place the GraalVM runtime in the expected directory when building the bundle
  • fix: the makeBundles SBT logic to place the GraalVM runtime in the expected directory

Important Notes

Checklist

Please ensure that the following checklist has been satisfied before submitting the PR:

  • The documentation has been updated, if necessary.
  • All code follows the
    Scala,
    Java,
    and
    Rust
    style guides. In case you are using a language not listed above, follow the Rust style guide.
  • All code has been tested:
    • Unit tests have been written where possible.

@4e6 4e6 added the CI: No changelog needed Do not require a changelog entry for this PR. label Oct 2, 2023
@4e6 4e6 self-assigned this Oct 2, 2023
@4e6 4e6 requested a review from mwu-tow as a code owner October 2, 2023 16:26
Copy link
Member

@JaroslavTulach JaroslavTulach left a comment

Choose a reason for hiding this comment

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

I'd prefer a bit more of automated testing:

build.sbt Outdated Show resolved Hide resolved
@Akirathan
Copy link
Member

Note that there is #7851 high in my backlog that will, once again, mess with the configuration of all the GraalVM-related paths and artifacts.

build/build/src/engine/bundle.rs Show resolved Hide resolved
@4e6 4e6 added the CI: Clean build required CI runners will be cleaned before and after this PR is built. label Oct 5, 2023
@@ -20,8 +20,7 @@ import java.io.File
// ============================================================================

val scalacVersion = "2.13.11"
// Since the release of GraalVM 23.0.0, the versioning is the same for Graal and OpenJDK.
val graalVersion = "17.0.7"
val graalVersion = "17.0.7"
Copy link
Member

Choose a reason for hiding this comment

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

Note that the newest Graal (PR is at #7991) does not have minor or patch version. It is just 21:

> java -version
openjdk version "21" 2023-09-19
OpenJDK Runtime Environment GraalVM CE 21+35.1 (build 21+35-jvmci-23.1-b15)
OpenJDK 64-Bit Server VM GraalVM CE 21+35.1 (build 21+35-jvmci-23.1-b15, mixed mode, sharing)

@4e6 4e6 added the CI: Ready to merge This PR is eligible for automatic merge label Oct 6, 2023
@mergify mergify bot merged commit f348083 into develop Oct 6, 2023
@mergify mergify bot deleted the wip/db/7871-enso-engine-bundle-doesnt-work-without-downloading branch October 6, 2023 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Clean build required CI runners will be cleaned before and after this PR is built. CI: No changelog needed Do not require a changelog entry for this PR. CI: Ready to merge This PR is eligible for automatic merge
Projects
None yet
5 participants