fixup

Author: tomerd

Sources/Workspace/Workspace.swift

@@ -1616,7 +1616,7 @@ extension Workspace {
                         let metadata = try jsonDecoder.decode(ArchiveIndexFile.self, from: body)
                         // FIXME: this filter needs to become more sophisticated
                         guard let supportedArchive = metadata.archives.first(where: { $0.fileName.lowercased().hasSuffix(".zip") && $0.supportedTriples.contains(hostToolchain.triple) }) else {
-                            throw StringError("No supported archive was found for '\(hostToolchain.triple)'")
+                            throw StringError("No supported archive was found for '\(hostToolchain.triple.tripleString)'")
                         }
                         // add relevant archive
                         zipArtifacts.append(

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -4847,6 +4847,7 @@ final class WorkspaceTests: XCTestCase {
         let sandbox = AbsolutePath("/tmp/ws/")
         let fs = InMemoryFileSystem()
         var downloads: [MockDownloader.Download] = []
+        let hostToolchain = try UserToolchain(destination: .hostDestination())
 
         let ariFiles = [
             """
@@ -4856,7 +4857,7 @@ final class WorkspaceTests: XCTestCase {
                     {
                         "fileName": "a1.zip",
                         "checksum": "a1",
-                        "supportedTriples": ["x86_64-apple-macosx"]
+                        "supportedTriples": ["\(hostToolchain.triple.tripleString)"]
                     }
                 ]
             }
@@ -4868,7 +4869,7 @@ final class WorkspaceTests: XCTestCase {
                     {
                         "fileName": "a2/a2.zip",
                         "checksum": "a2",
-                        "supportedTriples": ["x86_64-apple-macosx"]
+                        "supportedTriples": ["\(hostToolchain.triple.tripleString)"]
                     }
                 ]
             }
@@ -5120,6 +5121,7 @@ final class WorkspaceTests: XCTestCase {
     func testDownloadArchiveIndexFileBadChecksum() throws {
         let sandbox = AbsolutePath("/tmp/ws/")
         let fs = InMemoryFileSystem()
+        let hostToolchain = try UserToolchain(destination: .hostDestination())
 
         let ari = """
         {
@@ -5128,7 +5130,7 @@ final class WorkspaceTests: XCTestCase {
                 {
                     "fileName": "a1.zip",
                     "checksum": "a1",
-                    "supportedTriples": ["x86_64-apple-macosx"]
+                    "supportedTriples": ["\(hostToolchain.triple.tripleString)"]
                 }
             ]
         }
@@ -5258,6 +5260,7 @@ final class WorkspaceTests: XCTestCase {
     func testDownloadArchiveIndexFileBadArchivesChecksum() throws {
         let sandbox = AbsolutePath("/tmp/ws/")
         let fs = InMemoryFileSystem()
+        let hostToolchain = try UserToolchain(destination: .hostDestination())
 
         let ari = """
         {
@@ -5266,7 +5269,7 @@ final class WorkspaceTests: XCTestCase {
                 {
                     "fileName": "a.zip",
                     "checksum": "a",
-                    "supportedTriples": ["x86_64-apple-macosx"]
+                    "supportedTriples": ["\(hostToolchain.triple.tripleString)"]
                 }
             ]
         }
@@ -5375,6 +5378,7 @@ final class WorkspaceTests: XCTestCase {
     func testDownloadArchiveIndexFileArchiveNotFound() throws {
         let sandbox = AbsolutePath("/tmp/ws/")
         let fs = InMemoryFileSystem()
+        let hostToolchain = try UserToolchain(destination: .hostDestination())
 
         let ari = """
         {
@@ -5383,7 +5387,7 @@ final class WorkspaceTests: XCTestCase {
                 {
                     "fileName": "not-found.zip",
                     "checksum": "a",
-                    "supportedTriples": ["x86_64-apple-macosx"]
+                    "supportedTriples": ["\(hostToolchain.triple.tripleString)"]
                 }
             ]
         }
@@ -5451,6 +5455,83 @@ final class WorkspaceTests: XCTestCase {
         }
     }
 
+    func testDownloadArchiveIndexTripleNotFound() throws {
+        let sandbox = AbsolutePath("/tmp/ws/")
+        let fs = InMemoryFileSystem()
+
+        let hostToolchain = try UserToolchain(destination: .hostDestination())
+        let andriodTriple = try Triple("x86_64-unknown-linux-android")
+        let notHostTriple = hostToolchain.triple == andriodTriple ? .macOS : andriodTriple
+
+        let ari = """
+        {
+            "schemaVersion": "1.0",
+            "archives": [
+                {
+                    "fileName": "a1.zip",
+                    "checksum": "a1",
+                    "supportedTriples": ["\(notHostTriple.tripleString)"]
+                }
+            ]
+        }
+        """
+        let checksumAlgorithm = MockHashAlgorithm() // used in tests
+        let ariChecksum = checksumAlgorithm.hash(ari).hexadecimalRepresentation
+
+        // returns a dummy ari files for the requested artifact
+        let httpClient = HTTPClient(handler: { request, _, completion in
+            do {
+                let contents: String
+                switch request.url.lastPathComponent {
+                case "a.ari":
+                    contents = ari
+                default:
+                    throw StringError("unexpected url \(request.url)")
+                }
+                completion(.success(.init(statusCode: 200, body: Data(contents.utf8))))
+            } catch {
+                completion(.failure( DownloaderError.clientError(error)))
+            }
+        })
+
+        let workspace = try MockWorkspace(
+            sandbox: sandbox,
+            fs: fs,
+            httpClient: httpClient,
+            roots: [
+                MockPackage(
+                    name: "Foo",
+                    targets: [
+                        MockTarget(name: "Foo", dependencies: ["A"]),
+                    ],
+                    products: [],
+                    dependencies: [
+                        .git(name: "A", requirement: .exact("1.0.0")),
+                    ]
+                ),
+            ],
+            packages: [
+                MockPackage(
+                    name: "A",
+                    targets: [
+                        MockTarget(name: "A", type: .binary, url: "https://a.com/a.ari", checksum: ariChecksum),
+                    ],
+                    products: [
+                        MockProduct(name: "A", targets: ["A"]),
+                    ],
+                    versions: ["0.9.0", "1.0.0"]
+                ),
+            ]
+        )
+
+        workspace.checkPackageGraphFailure(roots: ["Foo"]) { diagnostics in
+            XCTAssertEqual(workspace.downloader.downloads, [])
+            DiagnosticsEngineTester(diagnostics) { result in
+                result.check(diagnostic: .contains("failed retrieving 'https://a.com/a.ari': No supported archive was found for '\(hostToolchain.triple.tripleString)'"), behavior: .error)
+            }
+        }
+    }
+
     func testAndroidCompilerFlags() throws {
         let target = try Triple("x86_64-unknown-linux-android")
         let sdk = AbsolutePath("/some/path/to/an/SDK.sdk")