Adopt the static linux sdk

Author: cmcgee1024

Package.resolved

@@ -17,7 +17,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
         .package(url: "https://github.com/swift-server/async-http-client", from: "1.21.2"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.64.0"),
-        .package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.7.1"),
+        //.package(url: "https://github.com/apple/swift-tools-support-core.git", from: "0.7.1"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
         // This dependency provides the correct version of the formatter so that you can run `swift run swiftformat Package.swift Plugins/ Sources/ Tests/`
         .package(url: "https://github.com/nicklockwood/SwiftFormat", exact: "0.49.18"),
@@ -30,7 +30,7 @@ let package = Package(
                 .target(name: "SwiftlyCore"),
                 .target(name: "LinuxPlatform", condition: .when(platforms: [.linux])),
                 .target(name: "MacOSPlatform", condition: .when(platforms: [.macOS])),
-                .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+                //.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
             ]
         ),
         .target(

Package.swift

@@ -1,8 +1,8 @@
 import _StringProcessing
 import ArgumentParser
 import Foundation
-import TSCBasic
-import TSCUtility
+//import TSCBasic
+//import TSCUtility
 
 import SwiftlyCore
 
@@ -192,10 +192,10 @@ struct Install: SwiftlyCommand {
             throw Error(message: "Invalid toolchain URL: \(url)")
         }
 
-        let animation = PercentProgressAnimation(
+        /*let animation = PercentProgressAnimation(
             stream: stdoutStream,
             header: "Downloading \(version)"
-        )
+        )*/
 
         var lastUpdate = Date()
 
@@ -215,20 +215,20 @@ struct Install: SwiftlyCommand {
 
                     lastUpdate = Date()
 
-                    animation.update(
+                    /*animation.update(
                         step: progress.receivedBytes,
                         total: progress.totalBytes!,
                         text: "Downloaded \(String(format: "%.1f", downloadedMiB)) MiB of \(String(format: "%.1f", totalMiB)) MiB"
-                    )
+                    )*/
                 }
             )
         } catch let notFound as SwiftlyHTTPClient.DownloadNotFoundError {
             throw Error(message: "\(version) does not exist at URL \(notFound.url), exiting")
         } catch {
-            animation.complete(success: false)
+            //animation.complete(success: false)
             throw error
         }
-        animation.complete(success: true)
+        //animation.complete(success: true)
 
         if verifySignature {
             try await Swiftly.currentPlatform.verifySignature(

Sources/Swiftly/Install.swift

@@ -1,7 +1,7 @@
 import ArgumentParser
 import Foundation
-import TSCBasic
-import TSCUtility
+//import TSCBasic
+//import TSCUtility
 
 import SwiftlyCore
 
@@ -70,10 +70,10 @@ internal struct SelfUpdate: SwiftlyCommand {
             try? FileManager.default.removeItem(at: tmpFile)
         }
 
-        let animation = PercentProgressAnimation(
+        /*let animation = PercentProgressAnimation(
             stream: stdoutStream,
             header: "Downloading swiftly \(version)"
-        )
+        )*/
         do {
             try await SwiftlyCore.httpClient.downloadFile(
                 url: downloadURL,
@@ -82,18 +82,18 @@ internal struct SelfUpdate: SwiftlyCommand {
                     let downloadedMiB = Double(progress.receivedBytes) / (1024.0 * 1024.0)
                     let totalMiB = Double(progress.totalBytes!) / (1024.0 * 1024.0)
 
-                    animation.update(
+                    /*animation.update(
                         step: progress.receivedBytes,
                         total: progress.totalBytes!,
                         text: "Downloaded \(String(format: "%.1f", downloadedMiB)) MiB of \(String(format: "%.1f", totalMiB)) MiB"
-                    )
+                    )*/
                 }
             )
         } catch {
-            animation.complete(success: false)
+            //animation.complete(success: false)
             throw error
         }
-        animation.complete(success: true)
+        //animation.complete(success: true)
 
         try await Swiftly.currentPlatform.verifySignature(httpClient: SwiftlyCore.httpClient, archiveDownloadURL: downloadURL, archive: tmpFile, verbose: verbose)
         try Swiftly.currentPlatform.extractSwiftlyAndInstall(from: tmpFile)

Sources/Swiftly/SelfUpdate.swift

@@ -371,8 +371,17 @@ struct BuildSwiftlyRelease: AsyncParsableCommand {
 
         FileManager.default.changeCurrentDirectoryPath(cwd)
 
-        // Statically link standard libraries for maximum portability of the swiftly binary
-        try runProgram(swift, "build", "--product=swiftly", "--pkg-config-path=\(pkgConfigPath)/lib/pkgconfig", "--static-swift-stdlib", "--configuration=release")
+        // Statically link standard libraries and use the static sdk for maximum portability
+#if arch(arm64)
+        let sdkName = "aarch64-swift-linux-musl"
+#else
+        let sdkName = "x86_64-swift-linux-musl"
+#endif
+
+        // FIXME: Adjust the URL and checksum to match the toolchain that is being used
+        try runProgram(swift, "sdk", "install" "https://download.swift.org/swift-6.0.3-release/static-sdk/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE_static-linux-0.0.1.artifactbundle.tar.gz", "--checksum", "67f765e0030e661a7450f7e4877cfe008db4f57f177d5a08a6e26fd661cdd0bd")
+
+        try runProgram(swift, "build", "--swift-sdk", sdkName, "--product=swiftly", "--pkg-config-path=\(pkgConfigPath)/lib/pkgconfig", "--static-swift-stdlib", "--configuration=release")
 
         let releaseDir = cwd + "/.build/release"