Skip to content

Fix swift package describe for packages with binary artifacts that has a .zip extension. #8809

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jul 9, 2025
Merged

Fix swift package describe for packages with binary artifacts that has a .zip extension. #8809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35ba1ef
Fix `swift package describe` for packages with binary artifacts that …
taji-taji Jun 12, 2025
8777cd9
Add a case with a local zip binary package to testLoadRootPackageWith…
taji-taji Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions Sources/Workspace/Workspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,18 +1161,25 @@ extension Workspace {
if let path = target.path {
let artifactPath = try manifest.path.parentDirectory
.appending(RelativePath(validating: path))
guard let (_, artifactKind) = try BinaryArtifactsManager.deriveBinaryArtifact(
if artifactPath.extension?.lowercased() == "zip" {
partial[target.name] = BinaryArtifact(
kind: .unknown,
originURL: .none,
path: artifactPath
)
} else if let (_, artifactKind) = try BinaryArtifactsManager.deriveBinaryArtifact(
fileSystem: self.fileSystem,
path: artifactPath,
observabilityScope: observabilityScope
) else {
) {
partial[target.name] = BinaryArtifact(
kind: artifactKind,
originURL: .none,
path: artifactPath
)
} else {
throw StringError("\(artifactPath) does not contain binary artifact")
}
partial[target.name] = BinaryArtifact(
kind: artifactKind,
originURL: .none,
path: artifactPath
)
} else if let url = target.url.flatMap(URL.init(string:)) {
let fakePath = try manifest.path.parentDirectory.appending(components: "remote", "archive")
.appending(RelativePath(validating: url.lastPathComponent))
Expand Down
5 changes: 5 additions & 0 deletions Tests/WorkspaceTests/WorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9231,6 +9231,11 @@ final class WorkspaceTests: XCTestCase {
url: "https://a.com/a2.zip.zip",
checksum: "a3"
),
MockTarget(
name: "A4",
type: .binary,
path: "a4.zip"
),
],
products: []
),
Expand Down