Skip to content

Commit 6ba6f12

Browse files
Update GraalVM to 22.0.0, switch to Java 17
1 parent 027228f commit 6ba6f12

File tree

3 files changed

+33
-6
lines changed

3 files changed

+33
-6
lines changed

Diff for: build.sc

+18-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ trait ScalafmtNativeImage extends ScalaModule with NativeImage {
2222
)
2323
}
2424
def nativeImagePersist = System.getenv("CI") != null
25-
def nativeImageGraalVmJvmId = "graalvm-java11:21.2.0"
25+
def nativeImageGraalVmJvmId = "graalvm-java17:22.0.0"
2626
def nativeImageName = "scalafmt"
2727
def ivyDeps = super.ivyDeps() ++ Seq(
2828
ivy"org.scalameta::scalafmt-cli:$scalafmtVersion"
@@ -47,12 +47,24 @@ def csDockerVersion = "2.0.16"
4747

4848
object `native-static` extends ScalafmtNativeImage {
4949
def nameSuffix = "-static"
50-
def nativeImageDockerParams = Some(
51-
NativeImage.linuxStaticParams(
52-
"messense/rust-musl-cross@sha256:12d0dd535ef7364bf49cb2608ae7eaf60e40d07834eb4d9160c592422a08d3b3",
53-
s"https://github.com/coursier/coursier/releases/download/v$csDockerVersion/cs-x86_64-pc-linux"
50+
def buildHelperImage = T {
51+
os.proc("docker", "build", "-t", "scala-cli-base-musl:latest", ".")
52+
.call(cwd = os.pwd / "musl-image", stdout = os.Inherit)
53+
()
54+
}
55+
def nativeImageDockerParams = T{
56+
buildHelperImage()
57+
Some(
58+
NativeImage.linuxStaticParams(
59+
"scala-cli-base-musl:latest",
60+
s"https://github.com/coursier/coursier/releases/download/v$csDockerVersion/cs-x86_64-pc-linux"
61+
)
5462
)
55-
)
63+
}
64+
def writeNativeImageScript(scriptDest: String, imageDest: String = "") = T.command {
65+
buildHelperImage()
66+
super.writeNativeImageScript(scriptDest, imageDest)()
67+
}
5668
}
5769

5870
object `native-mostly-static` extends ScalafmtNativeImage {

Diff for: musl-image/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# copied from https://github.com/VirtusLab/scala-cli/blob/b73b3e612eeba09c3231da9a51720cb8ddff1874/project/musl-image/Dockerfile
2+
FROM messense/rust-musl-cross@sha256:47a3721b3e186abfd705feb1e03bf1d5212357ea26762cceef11530e0a2f2c7c
3+
ADD setup.sh /setup.sh
4+
RUN /setup.sh

Diff for: musl-image/setup.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
# copied from https://github.com/VirtusLab/scala-cli/blob/b73b3e612eeba09c3231da9a51720cb8ddff1874/project/musl-image/setup.sh
5+
6+
cd /usr/local/musl/bin
7+
8+
for i in x86_64-unknown-linux-musl-*; do
9+
dest="$(echo "$i" | sed 's/-unknown//')"
10+
ln -s "$i" "$dest"
11+
done

0 commit comments

Comments
 (0)