Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ let package = Package(
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "_NIOFileSystem", package: "swift-nio"),
],
path: "Tools/build-swiftly-release"
path: "Tools/build-swiftly-release",
exclude: ["musl-clang"],
),
.target(
name: "LinuxPlatform",
Expand Down
6 changes: 3 additions & 3 deletions Sources/TestSwiftly/TestSwiftly.swift
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ struct TestSwiftly: AsyncParsableCommand {
Foundation.exit(2)
}

guard case let swiftlyArchive = FilePath(swiftlyArchive) else { fatalError("") }
let swiftlyArchiveFile = FilePath(swiftlyArchive)

print("Extracting swiftly release")
#if os(Linux)
try await sys.tar().extract(.verbose, .compressed, .archive(swiftlyArchive)).run(currentPlatform, quiet: false)
try await sys.tar().extract(.verbose, .compressed, .archive(swiftlyArchiveFile)).run(currentPlatform, quiet: false)
#elseif os(macOS)
try await sys.installer(.verbose, .pkg(swiftlyArchive), .target("CurrentUserHomeDirectory")).run(currentPlatform, quiet: false)
try await sys.installer(.verbose, .pkg(swiftlyArchiveFile), .target("CurrentUserHomeDirectory")).run(currentPlatform, quiet: false)
#endif

#if os(Linux)
Expand Down
5 changes: 3 additions & 2 deletions Tools/generate-command-models/GenerateCommandModels.swift
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,12 @@ struct GenerateCommandModels: AsyncParsableCommand {

let configFunc: String
if path.count == 0 {
let genArgs = options.asArgs + vars.asArgs
configFunc = """
public func config() -> Configuration {
var genArgs: [String] = []
\(genArgs.isEmpty ? "let" : "var") genArgs: [String] = []

\((options.asArgs + vars.asArgs).joined(separator: "\n" + indent(1)))
\(genArgs.joined(separator: "\n" + indent(1)))

return Configuration(
executable: self.executable,
Expand Down