luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address PR feedback & fix CI

This commit is contained in:
friendseeker 2024-10-24 00:04:29 -07:00
parent d340ff916e
commit 60b451c3d1
No known key found for this signature in database
GPG Key ID: 7DD5039728A27160
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -83,6 +83,7 @@ jobs:
ref: 1.10.x ref: 1.10.x
path: zinc path: zinc
- uses: graalvm/setup-graalvm@v1 - uses: graalvm/setup-graalvm@v1
if: ${{ matrix.jobtype >= 7 && matrix.jobtype <= 9 }}
with: with:
java-version: '23' java-version: '23'
native-image-musl: 'true' native-image-musl: 'true'

2
build.sbt
View File

@ -1198,7 +1198,7 @@ lazy val sbtClientProj = (project in file("client"))
s"-H:Name=${target.value / "bin" / "sbtn"}", s"-H:Name=${target.value / "bin" / "sbtn"}",
) ++ (if (isLinux && isArmArchitecture) ) ++ (if (isLinux && isArmArchitecture)
Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
else Nil) ++ (if (isLinux) Seq("--static", "--libc=musl") else Nil), else Nil) ++ (if (isLinux && !isArmArchitecture) Seq("--static", "--libc=musl") else Nil),
buildThinClient := { buildThinClient := {
val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish") val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish")
val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh" val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh"