From 801137de3190e997dbd1eaff1ae2418e2703a7e7 Mon Sep 17 00:00:00 2001
From: friendseeker <66892505+Friendseeker@users.noreply.github.com>
Date: Thu, 31 Oct 2024 20:43:10 -0700
Subject: [PATCH] Revert "Merge pull request #7823 from Friendseeker/musl"

This reverts commit 0c00dbaf4bd1b1fa6075bfefd99947b454785b00, reversing
changes made to 91ea2feb64eec747c03b7c6000b17bede71339fc.
---
 .github/workflows/ci.yml |  7 -------
 build.sbt                | 11 +++--------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6cb5ca518..6387d3779 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,13 +80,6 @@ jobs:
         repository: sbt/zinc
         ref: 1.10.x
         path: zinc
-    - uses: graalvm/setup-graalvm@v1
-      if: ${{ matrix.jobtype >= 7 && matrix.jobtype <= 9 }}
-      with:
-        java-version: '23'
-        native-image-musl: 'true'
-        set-java-home: 'false'
-        github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Setup JDK
       uses: actions/setup-java@v4
       with:
diff --git a/build.sbt b/build.sbt
index 043b4880d..eff81a5c8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1176,13 +1176,8 @@ lazy val sbtClientProj = (project in file("client"))
     nativeImageReady := { () =>
       ()
     },
-    if (isArmArchitecture)
-      Seq(
-        nativeImageVersion := "23.0",
-        nativeImageJvm := "graalvm-java23",
-      )
-    else Nil,
-    nativeImageInstalled := !isArmArchitecture,
+    nativeImageVersion := "23.0",
+    nativeImageJvm := "graalvm-java23",
     nativeImageOutput := {
       val outputDir = (target.value / "bin").toPath
       if (!Files.exists(outputDir)) {
@@ -1204,7 +1199,7 @@ lazy val sbtClientProj = (project in file("client"))
       s"-H:Name=${target.value / "bin" / "sbtn"}",
     ) ++ (if (isLinux && isArmArchitecture)
             Seq("-H:PageSize=65536") // Make sure binary runs on kernels with page size set to 4k, 16 and 64k
-          else Nil) ++ (if (isLinux && !isArmArchitecture) Seq("--static", "--libc=musl") else Nil),
+          else Nil),
     buildThinClient := {
       val isFish = Def.spaceDelimited("").parsed.headOption.fold(false)(_ == "--fish")
       val ext = if (isWin) ".bat" else if (isFish) ".fish" else ".sh"