Merge branch 'main' of https://github.com/swiftlang/swiftly into xcode_selector

Author: cmcgee1024

Sources/Swiftly/Config.swift

@@ -9,12 +9,13 @@ public struct Config: Codable, Equatable, Sendable {
     public var inUse: ToolchainVersion?
     public var installedToolchains: Set<ToolchainVersion>
     public var platform: PlatformDefinition
-    public var version: SwiftlyVersion?
+    public var version: SwiftlyVersion
 
-    init(inUse: ToolchainVersion?, installedToolchains: Set<ToolchainVersion>, platform: PlatformDefinition) {
+    init(inUse: ToolchainVersion?, installedToolchains: Set<ToolchainVersion>, platform: PlatformDefinition, version: SwiftlyVersion) {
         self.inUse = inUse
         self.installedToolchains = installedToolchains
         self.platform = platform
+        self.version = version
     }
 
     private static func makeEncoder() -> JSONEncoder {
@@ -28,12 +29,8 @@ public struct Config: Codable, Equatable, Sendable {
         do {
             let configFile = Swiftly.currentPlatform.swiftlyConfigFile(ctx)
             let data = try await fs.cat(atPath: configFile)
-            var config = try JSONDecoder().decode(Config.self, from: data)
-            if config.version == nil {
-                // Assume that the version of swiftly is 0.3.0 because that is the last
-                // unversioned release.
-                config.version = try? SwiftlyVersion(parsing: "0.3.0")
-            }
+            let config = try JSONDecoder().decode(Config.self, from: data)
+
             return config
         } catch {
             let msg = """

Sources/Swiftly/Init.swift

@@ -48,7 +48,7 @@ struct Init: SwiftlyCommand {
             (
                 config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0, suffix: "dev") ||
                     config.version == SwiftlyVersion(major: 0, minor: 4, patch: 0) ||
-                    (config.version?.major == 1 && config.version?.minor == 0)
+                    (config.version.major == 1 && config.version.minor == 0)
             )
         {
             // This is a simple upgrade from the 0.4.0 pre-releases, or 1.x
@@ -178,9 +178,8 @@ struct Init: SwiftlyCommand {
         // Force the configuration to be present. Generate it if it doesn't already exist or overwrite is set
         if overwrite || config == nil {
             let pd = try await Swiftly.currentPlatform.detectPlatform(ctx, disableConfirmation: assumeYes, platform: platform)
-            var c = Config(inUse: nil, installedToolchains: [], platform: pd)
-            // Stamp the current version of swiftly on this config
-            c.version = SwiftlyCore.version
+            let c = Config(inUse: nil, installedToolchains: [], platform: pd, version: SwiftlyCore.version)
+
             try c.save(ctx)
             config = c
         }

Tests/SwiftlyTests/CommandLineTests.swift

@@ -95,7 +95,8 @@ public struct CommandLineTests {
         // AND a simple history
         try "Some text".write(to: tmp / "foo.txt", atomically: true)
         try await Swiftly.currentPlatform.runProgram("git", "-C", "\(tmp)", "add", "foo.txt")
-        try await Swiftly.currentPlatform.runProgram("git", "-C", "\(tmp)", "config", "user.email", "[email protected]")
+        try await Swiftly.currentPlatform.runProgram("git", "-C", "\(tmp)", "config", "--local", "user.email", "[email protected]")
+        try await Swiftly.currentPlatform.runProgram("git", "-C", "\(tmp)", "config", "--local", "commit.gpgsign", "false")
         try await sys.git(.workingDir(tmp)).commit(.message("Initial commit")).run(Swiftly.currentPlatform)
         try await sys.git(.workingDir(tmp)).diffindex(.quiet, tree_ish: "HEAD").run(Swiftly.currentPlatform)
 

Tests/SwiftlyTests/InstallTests.swift

@@ -327,17 +327,17 @@ import Testing
             try? FileManager.default.removeItem(atPath: pipePath)
         }
 
-        var receivedMessages: [ProgressInfo] = []
         let decoder = JSONDecoder()
-        var installCompleted = false
 
         let readerTask = Task {
-            guard let fileHandle = FileHandle(forReadingAtPath: pipePath) else { return }
+            var receivedMessages: [ProgressInfo] = []
+
+            guard let fileHandle = FileHandle(forReadingAtPath: pipePath) else { throw SwiftlyError(message: "Unable to open file handle at \(pipePath)") }
             defer { fileHandle.closeFile() }
 
             var buffer = Data()
 
-            while !installCompleted {
+            while true {
                 let data = fileHandle.availableData
                 if data.isEmpty {
                     try await Task.sleep(nanoseconds: 100_000_000)
@@ -354,13 +354,14 @@ import Testing
                         if let progress = try? decoder.decode(ProgressInfo.self, from: lineData) {
                             receivedMessages.append(progress)
                             if case .complete = progress {
-                                installCompleted = true
-                                return
+                                return receivedMessages
                             }
                         }
                     }
                 }
             }
+
+            return receivedMessages
         }
 
         let installTask = Task {
@@ -371,10 +372,10 @@ import Testing
             ])
         }
 
-        await withTaskGroup(of: Void.self) { group in
-            group.addTask { try? await readerTask.value }
-            group.addTask { try? await installTask.value }
-        }
+        let readerResult = await readerTask.result
+        try await installTask.value
+
+        let receivedMessages = try readerResult.get()
 
         #expect(!receivedMessages.isEmpty, "Named pipe should receive progress entries")
 

Tests/SwiftlyTests/SwiftlyTests.swift

@@ -220,7 +220,8 @@ public enum SwiftlyTests {
         return Config(
             inUse: nil,
             installedToolchains: [],
-            platform: pd
+            platform: pd,
+            version: SwiftlyCore.version
         )
     }