Skip to content

Commit

Permalink
Update GraalVM to 21.3.0, use Java 17 GraalVM
Browse files Browse the repository at this point in the history
But keep using GraalVM 21.2.0 on Windows (weird dead lock on CI)
  • Loading branch information
alexarchambault committed Dec 22, 2021
1 parent 7d4b6f4 commit 15aad1e
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 3 deletions.
13 changes: 10 additions & 3 deletions project/deps.sc
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import mill._, scalalib._

import scala.util.Properties

object Scala {
def scala212 = "2.12.15"
def scala213 = "2.13.6"
Expand Down Expand Up @@ -90,16 +92,21 @@ object Deps {
def usingDirectives = ivy"org.virtuslab:using_directives:0.0.7-4f0dd5d-SNAPSHOT"
}

private def graalVmVersion = "21.2.0"
def graalVmJvmId = s"graalvm-java11:$graalVmVersion"
private def graalVmVersion =
if (Properties.isWin) "21.2.0"
else "21.3.0"
def graalVmJvmId =
if (Properties.isWin) s"graalvm-java16:$graalVmVersion"
else s"graalvm-java17:$graalVmVersion"

def csDockerVersion = Deps.Versions.coursier

def buildCsVersion = Deps.Versions.coursier

object Docker {
def customMuslBuilderImageName = "scala-cli-base-musl"
def muslBuilder =
"messense/rust-musl-cross@sha256:12d0dd535ef7364bf49cb2608ae7eaf60e40d07834eb4d9160c592422a08d3b3"
s"$customMuslBuilderImageName:latest"

def testImage = "ubuntu:18.04"
def alpineTestImage =
Expand Down
3 changes: 3 additions & 0 deletions project/musl-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM messense/rust-musl-cross@sha256:47a3721b3e186abfd705feb1e03bf1d5212357ea26762cceef11530e0a2f2c7c
ADD setup.sh /setup.sh
RUN /setup.sh
9 changes: 9 additions & 0 deletions project/musl-image/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash
set -e

cd /usr/local/musl/bin

for i in x86_64-unknown-linux-musl-*; do
dest="$(echo "$i" | sed 's/-unknown//')"
ln -s "$i" "$dest"
done
14 changes: 14 additions & 0 deletions project/settings.sc
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,20 @@ trait CliLaunchers extends SbtModule { self =>
s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz"
)
)
def nativeImageOptions = T {
super.nativeImageOptions() ++ Seq(
"-H:-CheckToolchain"
)
}
def buildHelperImage = T {
os.proc("docker", "build", "-t", Docker.customMuslBuilderImageName, ".")
.call(cwd = os.pwd / "project" / "musl-image", stdout = os.Inherit)
()
}
def nativeImage = T {
buildHelperImage()
super.nativeImage()
}
}

object `mostly-static-image` extends CliNativeImage {
Expand Down

0 comments on commit 15aad1e

Please sign in to comment.