Migrate Linux code paths

Author: cmcgee1024

Sources/LinuxPlatform/Linux.swift

@@ -323,7 +323,7 @@ public struct Linux: Platform {
         }
     }
 
-    public func install(_ ctx: SwiftlyCoreContext, from tmpFile: URL, version: ToolchainVersion, verbose: Bool) throws {
+    public func install(_ ctx: SwiftlyCoreContext, from tmpFile: URL, version: ToolchainVersion, verbose: Bool) async throws {
         guard tmpFile.fileExists() else {
             throw SwiftlyError(message: "\(tmpFile) doesn't exist")
         }
@@ -332,7 +332,7 @@ public struct Linux: Platform {
             try FileManager.default.createDirectory(at: self.swiftlyToolchainsDir(ctx), withIntermediateDirectories: false)
         }
 
-        ctx.print("Extracting toolchain...")
+        await ctx.print("Extracting toolchain...")
         let toolchainDir = self.swiftlyToolchainsDir(ctx).appendingPathComponent(version.name)
 
         if toolchainDir.fileExists() {
@@ -347,15 +347,18 @@ public struct Linux: Platform {
             let destination = toolchainDir.appendingPathComponent(String(relativePath))
 
             if verbose {
-                ctx.print("\(destination.path)")
+                // To avoid having to make extractArchive async this is a regular print
+                //  to stdout. Note that it is unlikely that the test mocking will require
+                //  capturing this output.
+                print("\(destination.path)")
             }
 
             // prepend /path/to/swiftlyHomeDir/toolchains/<toolchain> to each file name
             return destination
         }
     }
 
-    public func extractSwiftlyAndInstall(_ ctx: SwiftlyCoreContext, from archive: URL) throws {
+    public func extractSwiftlyAndInstall(_ ctx: SwiftlyCoreContext, from archive: URL) async throws {
         guard archive.fileExists() else {
             throw SwiftlyError(message: "\(archive) doesn't exist")
         }
@@ -366,7 +369,7 @@ public struct Linux: Platform {
         }
         try FileManager.default.createDirectory(atPath: tmpDir.path, withIntermediateDirectories: true)
 
-        ctx.print("Extracting new swiftly...")
+        await ctx.print("Extracting new swiftly...")
         try extractArchive(atPath: archive) { name in
             // Extract to the temporary directory
             tmpDir.appendingPathComponent(String(name))
@@ -392,7 +395,7 @@ public struct Linux: Platform {
 
     public func verifySignature(_ ctx: SwiftlyCoreContext, archiveDownloadURL: URL, archive: URL, verbose: Bool) async throws {
         if verbose {
-            ctx.print("Downloading toolchain signature...")
+            await ctx.print("Downloading toolchain signature...")
         }
 
         let sigFile = self.getTempFilePath()
@@ -406,7 +409,7 @@ public struct Linux: Platform {
             to: sigFile
         )
 
-        ctx.print("Verifying toolchain signature...")
+        await ctx.print("Verifying toolchain signature...")
         do {
             if let mockedHomeDir = ctx.mockedHomeDir {
                 try self.runProgram("gpg", "--verify", sigFile.path, archive.path, quiet: false, env: ["GNUPGHOME": mockedHomeDir.appendingPathComponent(".gnupg").path])
@@ -434,7 +437,7 @@ public struct Linux: Platform {
         \(selections)
         """)
 
-        let choice = ctx.readLine(prompt: "Pick one of the available selections [0-\(self.linuxPlatforms.count)] ") ?? "0"
+        let choice = await ctx.readLine(prompt: "Pick one of the available selections [0-\(self.linuxPlatforms.count)] ") ?? "0"
 
         guard let choiceNum = Int(choice) else {
             fatalError("Installation canceled")

Tests/SwiftlyTests/PlatformTests.swift

@@ -11,7 +11,7 @@ import Testing
         let tmpDir = Swiftly.currentPlatform.getTempFilePath()
         try! FileManager.default.createDirectory(at: tmpDir, withIntermediateDirectories: true)
         let mockedToolchainFile = tmpDir.appendingPathComponent("swift-\(version).\(ext)")
-        let mockedToolchain = try mockDownloader.makeMockedToolchain(toolchain: version, name: tmpDir.path)
+        let mockedToolchain = try await mockDownloader.makeMockedToolchain(toolchain: version, name: tmpDir.path)
         try mockedToolchain.write(to: mockedToolchainFile)
 
         return (mockedToolchainFile, version, tmpDir)

Tests/SwiftlyTests/SwiftlyTests.swift

@@ -507,7 +507,7 @@ public struct SwiftExecutable {
 
 /// An `HTTPRequestExecutor` which will return a mocked response to any toolchain download requests.
 /// All other requests are performed using an actual HTTP client.
-public final class MockToolchainDownloader: HTTPRequestExecutor {
+public final actor MockToolchainDownloader: HTTPRequestExecutor {
     private static func releaseURLRegex() -> Regex<(Substring, Substring, Substring, Substring?)> {
         try! Regex("swift-(\\d+)\\.(\\d+)(?:\\.(\\d+))?-RELEASE")
     }

Tools/build-swiftly-release/BuildSwiftlyRelease.swift

@@ -478,7 +478,7 @@ struct BuildSwiftlyRelease: AsyncParsableCommand {
         try runProgram("productbuild", "--synthesize", "--package", pkgFile.path, distFile.path)
 
         var distFileContents = try String(contentsOf: distFile, encoding: .utf8)
-        distFileContents = distFileContents.replacingOccurrences(of: "<choices-outline>", with: "<domains enable_anywhere=\"false\" enable_currentUserHome=\"true\" enable_localSystem=\"false\"/><choices-outline>")
+        distFileContents = distFileContents.replacingOccurrences(of: "<choices-outline>", with: "<title>swiftly</title><domains enable_anywhere=\"false\" enable_currentUserHome=\"true\" enable_localSystem=\"false\"/><choices-outline>")
         try distFileContents.write(to: distFile, atomically: true, encoding: .utf8)
 
         if let cert = cert {