Skip to content

Commit 164d34a

Browse files
committed
workflows: Fix multiline string formatting for swift-format
1 parent c1fe156 commit 164d34a

File tree

4 files changed

+32
-31
lines changed

4 files changed

+32
-31
lines changed

Sources/SwiftSDKGenerator/Artifacts/DownloadableArtifacts.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ struct DownloadableArtifacts: Sendable {
8080
self.hostLLVM = .init(
8181
remoteURL: URL(
8282
string: """
83-
https://github.com/llvm/llvm-project/releases/download/llvmorg-\(
84-
versions.lldVersion
85-
)/clang+llvm-\(
86-
versions.lldVersion
87-
)-\(hostTriple.llvmBinaryURLSuffix).tar.xz
88-
"""
83+
https://github.com/llvm/llvm-project/releases/download/llvmorg-\(
84+
versions.lldVersion
85+
)/clang+llvm-\(
86+
versions.lldVersion
87+
)-\(hostTriple.llvmBinaryURLSuffix).tar.xz
88+
"""
8989
)!,
9090
localPath: paths.artifactsCachePath
9191
.appending("host_llvm_\(versions.lldVersion)_\(hostTriple.triple).tar.xz"),
@@ -104,12 +104,12 @@ struct DownloadableArtifacts: Sendable {
104104
self.hostLLVM = .init(
105105
remoteURL: URL(
106106
string: """
107-
https://github.com/llvm/llvm-project/releases/download/llvmorg-\(
108-
self.versions.lldVersion
109-
)/llvm-project-\(
110-
self.versions.lldVersion
111-
).src.tar.xz
112-
"""
107+
https://github.com/llvm/llvm-project/releases/download/llvmorg-\(
108+
self.versions.lldVersion
109+
)/llvm-project-\(
110+
self.versions.lldVersion
111+
).src.tar.xz
112+
"""
113113
)!,
114114
localPath: self.paths.artifactsCachePath
115115
.appending("llvm_\(self.versions.lldVersion).src.tar.xz"),

Sources/SwiftSDKGenerator/Generator/SwiftSDKGenerator+Download.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ extension HTTPClientProtocol {
221221
}
222222

223223
let packagesListURL = """
224-
\(mirrorURL)/dists/\(ubuntuRelease)\(releaseSuffix)/\(repository)/binary-\(
225-
targetTriple.arch!.debianConventionName
226-
)/\(packagesFileName(isXzAvailable: xzPath != nil))
227-
"""
224+
\(mirrorURL)/dists/\(ubuntuRelease)\(releaseSuffix)/\(repository)/binary-\(
225+
targetTriple.arch!.debianConventionName
226+
)/\(packagesFileName(isXzAvailable: xzPath != nil))
227+
"""
228228

229229
guard let packages = try await downloadUbuntuPackagesList(
230230
from: packagesListURL,

Sources/SwiftSDKGenerator/PlatformModels/VersionsConfiguration.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public struct VersionsConfiguration: Sendable {
6161

6262
return URL(
6363
string: """
64-
https://download.swift.org/\(
65-
self.swiftBranch
66-
)/\(
67-
subdirectory ?? computedSubdirectory
68-
)/swift-\(self.swiftVersion)/\(self.swiftDistributionName(platform: platform)).\(fileExtension)
69-
"""
64+
https://download.swift.org/\(
65+
self.swiftBranch
66+
)/\(
67+
subdirectory ?? computedSubdirectory
68+
)/swift-\(self.swiftVersion)/\(self.swiftDistributionName(platform: platform)).\(fileExtension)
69+
"""
7070
)!
7171
}
7272

Sources/SwiftSDKGenerator/Queries/DownloadArtifactQuery.swift

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,16 @@ struct DownloadArtifactQuery: Query {
3939
let byteCountFormatter = ByteCountFormatter()
4040

4141
if let total = progress.totalBytes {
42-
logger.debug("""
43-
\(artifact.remoteURL.lastPathComponent) \(
44-
byteCountFormatter
45-
.string(fromByteCount: Int64(progress.receivedBytes))
46-
)/\(
47-
byteCountFormatter
48-
.string(fromByteCount: Int64(total))
49-
)
50-
""")
42+
logger.debug(
43+
"""
44+
\(artifact.remoteURL.lastPathComponent) \(
45+
byteCountFormatter
46+
.string(fromByteCount: Int64(progress.receivedBytes))
47+
)/\(
48+
byteCountFormatter
49+
.string(fromByteCount: Int64(total))
50+
)
51+
""")
5152
} else {
5253
logger.debug(
5354
"\(artifact.remoteURL.lastPathComponent) \(byteCountFormatter.string(fromByteCount: Int64(progress.receivedBytes)))"

0 commit comments

Comments
 (0)