Skip to content

Move release 1.0 to swift 6.1 #305

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2025
Merged

Move release 1.0 to swift 6.1 #305

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
ec1e490
Move release 1.0 to swift 6.1
cmcgee1024 Apr 5, 2025
18face0
Update swift version check regexes in build script to work with swift…
cmcgee1024 Apr 6, 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
2 changes: 1 addition & 1 deletion .swift-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.3
6.1.0
15 changes: 10 additions & 5 deletions Tools/build-swiftly-release/BuildSwiftlyRelease.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public func runProgramOutput(_ program: String, _ args: String...) async throws
throw Error(message: "\(args.first!) exited with non-zero status: \(process.terminationStatus)")
}

if let outData = outData {
if let outData {
return String(data: outData, encoding: .utf8)
} else {
return nil
Expand Down Expand Up @@ -203,7 +203,7 @@ struct BuildSwiftlyRelease: AsyncParsableCommand {

if FileManager.default.fileExists(atPath: svFile.path) {
let selector = try? String(contentsOf: svFile, encoding: .utf8)
if let selector = selector {
if let selector {
return selector.replacingOccurrences(of: "\n", with: "")
}
return selector
Expand All @@ -220,10 +220,14 @@ struct BuildSwiftlyRelease: AsyncParsableCommand {
return try await self.assertTool("swift", message: "Please install swift and make sure that it is added to your path.")
}

guard let requiredSwiftVersion = try? self.findSwiftVersion() else {
guard var requiredSwiftVersion = try? self.findSwiftVersion() else {
throw Error(message: "Unable to determine the required swift version for this version of swiftly. Please make sure that you `cd <swiftly_git_dir>` and there is a .swift-version file there.")
}

if requiredSwiftVersion.hasSuffix(".0") {
requiredSwiftVersion = String(requiredSwiftVersion.dropLast(2))
}

let swift = try await self.assertTool("swift", message: "Please install swift \(requiredSwiftVersion) and make sure that it is added to your path.")

// We also need a swift toolchain with the correct version
Expand Down Expand Up @@ -287,7 +291,7 @@ struct BuildSwiftlyRelease: AsyncParsableCommand {
try? FileManager.default.createDirectory(atPath: pkgConfigPath, withIntermediateDirectories: true)

try? FileManager.default.removeItem(atPath: libArchivePath)
try runProgram(curl, "-o", "\(buildCheckoutsDir + "/libarchive-\(libArchiveVersion).tar.gz")", "--remote-name", "--location", "https://github.com/libarchive/libarchive/releases/download/v\(libArchiveVersion)/libarchive-\(libArchiveVersion).tar.gz")
try runProgram(curl, "-L", "-o", "\(buildCheckoutsDir + "/libarchive-\(libArchiveVersion).tar.gz")", "--remote-name", "--location", "https://github.com/libarchive/libarchive/releases/download/v\(libArchiveVersion)/libarchive-\(libArchiveVersion).tar.gz")
let libArchiveTarShaActual = try await runProgramOutput(sha256sum, "\(buildCheckoutsDir)/libarchive-\(libArchiveVersion).tar.gz")
guard let libArchiveTarShaActual, libArchiveTarShaActual.starts(with: libArchiveTarSha) else {
let shaActual = libArchiveTarShaActual ?? "none"
Expand All @@ -298,7 +302,8 @@ struct BuildSwiftlyRelease: AsyncParsableCommand {
let cwd = FileManager.default.currentDirectoryPath
FileManager.default.changeCurrentDirectoryPath(libArchivePath)

let swiftVerRegex: Regex<(Substring, Substring)> = try! Regex("Swift version (\\d+\\.\\d+\\.\\d+) ")
let swiftVerRegex: Regex<(Substring, Substring)> = try! Regex("Swift version (\\d+\\.\\d+\\.?\\d*) ")

let swiftVerOutput = (try await runProgramOutput(swift, "--version")) ?? ""
guard let swiftVerMatch = try swiftVerRegex.firstMatch(in: swiftVerOutput) else {
throw Error(message: "Unable to detect swift version")
Expand Down