From 4dec2f49c200b7cfdbc35a8a0a917fa2bc7b5848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danny=20M=C3=B6sch?= Date: Sat, 18 Oct 2025 10:01:20 +0200 Subject: [PATCH] Fix build warnings --- Package.swift | 3 ++- Sources/TestSwiftly/TestSwiftly.swift | 6 +++--- Tools/generate-command-models/GenerateCommandModels.swift | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index 7d806433..9b5b77ab 100644 --- a/Package.swift +++ b/Package.swift @@ -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", diff --git a/Sources/TestSwiftly/TestSwiftly.swift b/Sources/TestSwiftly/TestSwiftly.swift index 79e131df..a2dc9692 100644 --- a/Sources/TestSwiftly/TestSwiftly.swift +++ b/Sources/TestSwiftly/TestSwiftly.swift @@ -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) diff --git a/Tools/generate-command-models/GenerateCommandModels.swift b/Tools/generate-command-models/GenerateCommandModels.swift index 0c88265b..37c916bd 100644 --- a/Tools/generate-command-models/GenerateCommandModels.swift +++ b/Tools/generate-command-models/GenerateCommandModels.swift @@ -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,