From e6f4f0b961759231caf507bc301cdd75ec02e840 Mon Sep 17 00:00:00 2001
From: Sam Deane <sam@elegantchaos.com>
Date: Mon, 2 Sep 2024 14:56:26 +0100
Subject: [PATCH] Added missing compilers - urls are probably wrong

---
 Package.swift                                 |  2 +-
 Sources/ActionBuilderCore/Compiler.swift      | 15 ++++++
 .../ActionBuilderCoreTests.swift              |  2 +-
 .../Example-mac.package/Package.swift         | 46 +++++++++----------
 4 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/Package.swift b/Package.swift
index e598772..517a380 100644
--- a/Package.swift
+++ b/Package.swift
@@ -34,7 +34,7 @@ let package = Package(
     .package(url: "https://github.com/elegantchaos/Runner.git", from: "2.0.6"),
     .package(url: "https://github.com/elegantchaos/SemanticVersion.git", from: "1.1.0"),
     .package(url: "https://github.com/elegantchaos/Versionator.git", from: "2.0.2"),
-    .package(url: "https://github.com/elegantchaos/ChaosTesting", from: "1.0.0"),
+    .package(url: "https://github.com/elegantchaos/ChaosTesting", from: "1.0.1"),
   ],
 
   targets: [
diff --git a/Sources/ActionBuilderCore/Compiler.swift b/Sources/ActionBuilderCore/Compiler.swift
index 36f78cc..5f428e1 100644
--- a/Sources/ActionBuilderCore/Compiler.swift
+++ b/Sources/ActionBuilderCore/Compiler.swift
@@ -89,6 +89,21 @@ public final class Compiler: Identifiable, Sendable {
       .swift57, name: "Swift 5.7", short: "5.7", linux: "swiftlang/swift:nightly-5.7-bionic",
       mac: .toolchain(version: "13.4.1", branch: "swift-5.7-branch", image: "macos-12")),
 
+    // https://download.swift.org/development/xcode/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-06-26-a/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-06-26-a-osx.pkg
+    Compiler(
+      .swift58, name: "Swift 5.8", short: "5.8", linux: "swiftlang/swift:nightly-5.8-bionic",
+      mac: .toolchain(version: "13.4.1", branch: "swift-5.8-branch", image: "macos-12")),
+
+    // https://download.swift.org/development/xcode/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-06-26-a/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-06-26-a-osx.pkg
+    Compiler(
+      .swift59, name: "Swift 5.9", short: "5.9", linux: "swiftlang/swift:nightly-5.9-bionic",
+      mac: .toolchain(version: "13.4.1", branch: "swift-5.9-branch", image: "macos-12")),
+
+    // https://download.swift.org/development/xcode/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-06-26-a/swift-5.7-DEVELOPMENT-SNAPSHOT-2022-06-26-a-osx.pkg
+    Compiler(
+      .swift60, name: "Swift 6.0", short: "6.0", linux: "swiftlang/swift:nightly-6.0-bionic",
+      mac: .toolchain(version: "13.4.1", branch: "swift-6.0-branch", image: "macos-12")),
+
     // https://download.swift.org/development/xcode/swift-DEVELOPMENT-SNAPSHOT-2022-03-22-a/swift-DEVELOPMENT-SNAPSHOT-2022-03-22-a-osx.pkg
     Compiler(
       .swiftNightly, name: "Swift Development Nightly", short: "dev",
diff --git a/Tests/ActionBuilderCoreTests/ActionBuilderCoreTests.swift b/Tests/ActionBuilderCoreTests/ActionBuilderCoreTests.swift
index 3607c84..45e27b4 100644
--- a/Tests/ActionBuilderCoreTests/ActionBuilderCoreTests.swift
+++ b/Tests/ActionBuilderCoreTests/ActionBuilderCoreTests.swift
@@ -8,7 +8,7 @@ import Testing
 func testParsingPackageMacPlatform() async throws {
   let examplePackage = Bundle.module.url(forResource: "Example-mac", withExtension: "package")!
   let repo = try await Repo(forPackage: examplePackage)
-  #expect(repo.enabledCompilers.map { $0.id } == [.swift56, .swift57])
+  #expect(repo.enabledCompilers.map { $0.id } == [.swift56, .latestRelease])
   #expect(repo.enabledPlatforms.map { $0.id } == [.linux, .macOS])
 }
 
diff --git a/Tests/ActionBuilderCoreTests/Resources/Example-mac.package/Package.swift b/Tests/ActionBuilderCoreTests/Resources/Example-mac.package/Package.swift
index b7056f5..78fff4d 100644
--- a/Tests/ActionBuilderCoreTests/Resources/Example-mac.package/Package.swift
+++ b/Tests/ActionBuilderCoreTests/Resources/Example-mac.package/Package.swift
@@ -8,28 +8,26 @@
 import PackageDescription
 
 let package = Package(
-    name: "ExamplePackage",
-    
-    platforms: [
-        .macOS(.v12)
-    ],
-    
-    products: [
-        .library(
-            name: "ExamplePackage",
-            targets: ["ExamplePackage"]
-        ),
-        
-    ],
-
-    dependencies: [
-    ],
-
-    targets: [
-        .target(
-            name: "ExamplePackage",
-            dependencies: [
-            ]
-        ),
-    ]
+  name: "ExamplePackage",
+
+  platforms: [
+    .macOS(.v12)
+  ],
+
+  products: [
+    .library(
+      name: "ExamplePackage",
+      targets: ["ExamplePackage"]
+    )
+
+  ],
+
+  dependencies: [],
+
+  targets: [
+    .target(
+      name: "ExamplePackage",
+      dependencies: []
+    )
+  ]
 )