Adjust targetSwift path to include swiftPlatform to identify the toolchain

 - Otherwise weird things happen from the EndToEndTests when running tests that then need to re-download a new toolchain on top.

Author: xtremekforever

Sources/SwiftSDKGenerator/Artifacts/DownloadableArtifacts.swift

@@ -54,12 +54,12 @@ struct DownloadableArtifacts: Sendable {
 
     if hostTriple.os == .linux {
       // Amazon Linux 2 is chosen for its best compatibility with all Swift-supported Linux hosts
-      let linuxArchSuffix =
+      let hostArchSuffix =
         hostTriple.arch == .aarch64 ? "-\(Triple.Arch.aarch64.linuxConventionName)" : ""
       self.hostSwift = .init(
         remoteURL: versions.swiftDownloadURL(
-          subdirectory: "amazonlinux2\(linuxArchSuffix)",
-          platform: "amazonlinux2\(linuxArchSuffix)",
+          subdirectory: "amazonlinux2\(hostArchSuffix)",
+          platform: "amazonlinux2\(hostArchSuffix)",
           fileExtension: "tar.gz"
         ),
         localPath: paths.artifactsCachePath
@@ -97,7 +97,9 @@ struct DownloadableArtifacts: Sendable {
     self.targetSwift = .init(
       remoteURL: versions.swiftDownloadURL(),
       localPath: paths.artifactsCachePath
-        .appending("target_swift_\(versions.swiftVersion)_\(targetTriple.triple).tar.gz"),
+        .appending(
+          "target_swift_\(versions.swiftVersion)_\(versions.swiftPlatform)_\(targetTriple.archName).tar.gz"
+        ),
       isPrebuilt: true
     )
   }

Sources/SwiftSDKGenerator/PlatformModels/VersionsConfiguration.swift

@@ -42,40 +42,39 @@ public struct VersionsConfiguration: Sendable {
   var swiftPlatform: String {
     switch self.linuxDistribution {
     case let .ubuntu(ubuntu):
-      return "ubuntu\(ubuntu.version)\(self.linuxArchSuffix)"
+      return "ubuntu\(ubuntu.version)"
     case let .debian(debian):
       if debian.version == "11" {
-        logger.warning(
-          "Debian 11 selected but not officially supported by Swift, falling back on Ubuntu 20.04 toolchain..."
-        )
         // Ubuntu 20.04 toolchain is binary compatible with Debian 11
-        return "ubuntu20.04\(self.linuxArchSuffix)"
+        return "ubuntu20.04"
       } else if self.swiftVersion.hasPrefix("5.9") || self.swiftVersion == "5.10" {
-        logger.warning(
-          "Debian 12 selected but not officially supported by Swift version, falling back on Ubuntu 22.04 toolchain...",
-          metadata: ["swiftVersion": .string(self.swiftVersion)]
-        )
         // Ubuntu 22.04 toolchain is binary compatible with Debian 12
-        return "ubuntu22.04\(self.linuxArchSuffix)"
+        return "ubuntu22.04"
       }
-      return "debian\(debian.version)\(self.linuxArchSuffix)"
+      return "debian\(debian.version)"
     case let .rhel(rhel):
-      return "\(rhel.rawValue)\(self.linuxArchSuffix)"
+      return rhel.rawValue
     }
   }
 
+  var swiftPlatformAndSuffix: String {
+    return "\(self.swiftPlatform)\(self.linuxArchSuffix)"
+  }
+
   func swiftDistributionName(platform: String? = nil) -> String {
-    return "swift-\(self.swiftVersion)-\(platform ?? self.swiftPlatform)"
+    return
+      "swift-\(self.swiftVersion)-\(platform ?? self.swiftPlatformAndSuffix)"
   }
 
   func swiftDownloadURL(
     subdirectory: String? = nil,
     platform: String? = nil,
     fileExtension: String = "tar.gz"
   ) -> URL {
-    let computedPlatform = platform ?? self.swiftPlatform
+    let computedPlatform = platform ?? self.swiftPlatformAndSuffix
     let computedSubdirectory =
-      subdirectory ?? computedPlatform.replacingOccurrences(of: ".", with: "")
+      subdirectory
+      ?? computedPlatform.replacingOccurrences(of: ".", with: "")
 
     return URL(
       string: """

Tests/SwiftSDKGeneratorTests/EndToEndTests.swift

@@ -484,8 +484,8 @@ final class Swift59_DebianEndToEndTests: XCTestCase {
       config: config.withLinuxDistributionVersion("12").withArchitecture("x86_64"))
   }
 
-  // NOTE: the generator does not support building a Debian 11/Debian 12 Swift SDK for
-  // Swift 5.9.x and 5.10 without a pre-built container, so we do not test this here.
+  // NOTE: the generator does not support building a Debian 11/Debian 12 Swift SDK with Docker
+  // for Swift 5.9.x and 5.10 without a pre-built container, so we do not test this here.
 }
 
 final class Swift510_DebianEndToEndTests: XCTestCase {
@@ -529,8 +529,8 @@ final class Swift510_DebianEndToEndTests: XCTestCase {
       config: config.withLinuxDistributionVersion("11").withArchitecture("x86_64"))
   }
 
-  // NOTE: the generator does not support building a Debian 11 Swift container automatically,
-  // so we don't test this scenario.
+  // NOTE: Debian 11 containers do not exist for Swift, and the generator does not support
+  // generating this container for you automatically, so we do not test this scenario.
 }
 
 final class Swift60_DebianEndToEndTests: XCTestCase {
@@ -574,8 +574,8 @@ final class Swift60_DebianEndToEndTests: XCTestCase {
       config: config.withLinuxDistributionVersion("11").withArchitecture("x86_64"))
   }
 
-  // NOTE: the generator does not support building a Debian 11 Swift container automatically,
-  // so we don't test this scenario.}
+  // NOTE: Debian 11 containers do not exist for Swift, and the generator does not support
+  // generating this container for you automatically, so we do not test this scenario.
 }
 
 final class Swift59_RHELEndToEndTests: XCTestCase {