Add new Linux platforms: Ubuntu 24.04, Debian 12, Fedora 39 #173
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,17 @@ var swiftGPGKeysRefreshed = false | |
| /// This implementation can be reused for any supported Linux platform. | ||
| /// TODO: replace dummy implementations | ||
| public struct Linux: Platform { | ||
| let linuxPlatforms = [ | ||
| PlatformDefinition.ubuntu2404, | ||
| PlatformDefinition.ubuntu2204, | ||
| PlatformDefinition.ubuntu2004, | ||
| PlatformDefinition.ubuntu1804, | ||
| PlatformDefinition.fedora39, | ||
| PlatformDefinition.rhel9, | ||
| PlatformDefinition.amazonlinux2, | ||
| PlatformDefinition.debian12, | ||
| ] | ||
|
|
||
| public init() {} | ||
|
|
||
| public var appDataDirectory: URL { | ||
|
|
@@ -125,6 +136,26 @@ public struct Linux: Platform { | |
| "tzdata", | ||
| "zlib1g-dev", | ||
| ] | ||
| case "ubuntu2404": | ||
|
Contributor
There was a problem hiding this comment. I think we're missing 2310 from this list
Member
Author
There was a problem hiding this comment. I couldn't find a list of packages for ubuntu 23.10 from the Dockerfiles. If someone knows where the docker file is, I can add it here. This is where I usually look for them: https://github.com/swiftlang/swift-docker/tree/main/6.0/ubuntu
Member
Author
There was a problem hiding this comment. I manually pieced together the list by looking at the differences between ubuntu 22.04, and 24.04. Tested it out in docker and it looks to be working fine. There's only the swift 5.10.1 release available for that one though, so I wonder how useful and used this version of ubuntu will be.
Contributor
There was a problem hiding this comment. 23.10 only exists under https://github.com/swiftlang/swift-docker/blob/main/5.10/ubuntu/23.10/Dockerfile; but 23.10 reached end of life on July 2024.
Member
Author
There was a problem hiding this comment. I have removed 23.10 from the list because we can't bring up infrastructure for a platform that is EOL. |
||
| [ | ||
| "binutils", | ||
| "git", | ||
| "unzip", | ||
| "gnupg2", | ||
| "libc6-dev", | ||
| "libcurl4-openssl-dev", | ||
| "libedit2", | ||
| "libgcc-13-dev", | ||
| "libpython3-dev", | ||
| "libsqlite3-0", | ||
| "libstdc++-13-dev", | ||
| "libxml2-dev", | ||
| "libncurses-dev", | ||
| "libz3-dev", | ||
| "pkg-config", | ||
| "tzdata", | ||
| "zlib1g-dev", | ||
| ] | ||
| case "amazonlinux2": | ||
| [ | ||
| "binutils", | ||
|
|
@@ -158,6 +189,39 @@ public struct Linux: Platform { | |
| "unzip", | ||
| "zip", | ||
| ] | ||
| case "fedora39": | ||
| [ | ||
| "binutils", | ||
| "gcc", | ||
| "git", | ||
| "unzip", | ||
| "libcurl-devel", | ||
| "libedit-devel", | ||
| "libicu-devel", | ||
| "sqlite-devel", | ||
| "libuuid-devel", | ||
| "libxml2-devel", | ||
| "python3-devel", | ||
| "libstdc++-devel", | ||
| "libstdc++-static", | ||
| ] | ||
| case "debian12": | ||
| [ | ||
| "binutils-gold", | ||
| "libicu-dev", | ||
| "libcurl4-openssl-dev", | ||
| "libedit-dev", | ||
| "libsqlite3-dev", | ||
| "libncurses-dev", | ||
| "libpython3-dev", | ||
| "libxml2-dev", | ||
| "pkg-config", | ||
| "uuid-dev", | ||
| "tzdata", | ||
| "git", | ||
| "gcc", | ||
| "libstdc++-12-dev", | ||
| ] | ||
| default: | ||
| [] | ||
| } | ||
|
|
@@ -169,10 +233,16 @@ public struct Linux: Platform { | |
| "apt-get" | ||
| case "ubuntu2204": | ||
| "apt-get" | ||
| case "ubuntu2404": | ||
| "apt-get" | ||
| case "amazonlinux2": | ||
| "yum" | ||
| case "ubi9": | ||
| "yum" | ||
| case "fedora39": | ||
| "yum" | ||
| case "debian12": | ||
| "apt-get" | ||
| default: | ||
| nil | ||
| } | ||
|
|
@@ -196,7 +266,7 @@ public struct Linux: Platform { | |
| // Import the latest swift keys, but only once per session, which will help with the performance in tests | ||
| if !swiftGPGKeysRefreshed { | ||
| let tmpFile = self.getTempFilePath() | ||
| let _ = FileManager.default.createFile(atPath: tmpFile.path, contents: nil, attributes: [.posixPermissions: 0o600]) | ||
| defer { | ||
| try? FileManager.default.removeItem(at: tmpFile) | ||
| } | ||
|
|
@@ -407,7 +477,7 @@ public struct Linux: Platform { | |
| public func verifySignature(httpClient: SwiftlyHTTPClient, archiveDownloadURL: URL, archive: URL) async throws { | ||
| SwiftlyCore.print("Downloading toolchain signature...") | ||
| let sigFile = self.getTempFilePath() | ||
| let _ = FileManager.default.createFile(atPath: sigFile.path, contents: nil) | ||
| defer { | ||
| try? FileManager.default.removeItem(at: sigFile) | ||
| } | ||
|
|
@@ -425,59 +495,43 @@ public struct Linux: Platform { | |
| } | ||
| } | ||
|
|
||
| private func manualSelectPlatform(_ platformPretty: String?) async -> PlatformDefinition { | ||
| if let platformPretty = platformPretty { | ||
| print("\(platformPretty) is not an officially supported platform, but the toolchains for another platform may still work on it.") | ||
| } else { | ||
| print("This platform could not be detected, but a toolchain for one of the supported platforms may work on it.") | ||
| } | ||
|
|
||
| let selections = self.linuxPlatforms.enumerated().map { "\($0 + 1)) \($1.namePretty)" }.joined(separator: "\n") | ||
|
|
||
| print(""" | ||
| Please select the platform to use for toolchain downloads: | ||
|
|
||
| 0) Cancel | ||
| \(selections) | ||
| """) | ||
|
|
||
| let choice = SwiftlyCore.readLine(prompt: "Pick one of the available selections [0-\(self.linuxPlatforms.count)] ") ?? "0" | ||
|
|
||
| guard let choiceNum = Int(choice) else { | ||
|
Contributor
There was a problem hiding this comment. I think right now if you were to run this and enter 0 for cancel, it would explode, it would go on to run
Member
Author
There was a problem hiding this comment. I think that this guard will guard against non-integer input, such as "foo", or "bar". The guard below should check for 0, or something larger than the linuxPlatforms count and cancel the installation. The final array subscript at the return statement should be safely in range.
Contributor
There was a problem hiding this comment. oh I see, the guard clause tripped me up, Makes sense |
||
| fatalError("Installation canceled") | ||
| } | ||
|
|
||
| guard choiceNum > 0 && choiceNum <= self.linuxPlatforms.count else { | ||
| fatalError("Installation canceled") | ||
| } | ||
|
|
||
| return self.linuxPlatforms[choiceNum - 1] | ||
| } | ||
|
|
||
| public func detectPlatform(disableConfirmation: Bool, platform: String?) async throws -> PlatformDefinition { | ||
| // We've been given a hint to use | ||
| if let platform { | ||
| guard let pd = linuxPlatforms.first(where: { $0.nameFull == platform }) else { | ||
| fatalError("Unrecognized platform \(platform). Recognized values: \(self.linuxPlatforms.map(\.nameFull).joined(separator: ", ")).") | ||
| } | ||
|
|
||
| return pd | ||
| } | ||
|
|
||
| let osReleaseFiles = ["/etc/os-release", "/usr/lib/os-release"] | ||
|
|
@@ -498,98 +552,62 @@ public struct Linux: Platform { | |
| } else { | ||
| print(message) | ||
| } | ||
| return await self.manualSelectPlatform(platformPretty) | ||
| } | ||
|
|
||
| let releaseInfo = try String(contentsOfFile: releaseFile, encoding: .utf8) | ||
|
Contributor
There was a problem hiding this comment. should we still wrap this in an equivalent try/catch which calls to
Member
Author
There was a problem hiding this comment. I think that we want to heavily emphasize the platform auto-detection because it will make the user's life a ton easier. If there's some kind of problem reading the From the linux manual it says that "[a]ll strings should be in UTF-8 encoding, and non-printable characters should not be used." |
||
|
|
||
| var id: String? | ||
| var idlike: String? | ||
| var versionID: String? | ||
| for info in releaseInfo.split(separator: "\n").map(String.init) { | ||
| if info.hasPrefix("ID=") { | ||
| id = String(info.dropFirst("ID=".count)).replacingOccurrences(of: "\"", with: "") | ||
| } else if info.hasPrefix("ID_LIKE=") { | ||
| idlike = String(info.dropFirst("ID_LIKE=".count)).replacingOccurrences(of: "\"", with: "") | ||
| } else if info.hasPrefix("VERSION_ID=") { | ||
|
Contributor
There was a problem hiding this comment. Do we still need to account for stings which start with "UBUNTU_CODENAME" here?
Member
Author
There was a problem hiding this comment. We're reading this file line-by-line and we don't have any need for the ubuntu codename anymore. I think it's safe to just skip ubuntu codename lines. |
||
| versionID = String(info.dropFirst("VERSION_ID=".count)).replacingOccurrences(of: "\"", with: "").replacingOccurrences(of: ".", with: "") | ||
| } else if info.hasPrefix("PRETTY_NAME=") { | ||
| platformPretty = String(info.dropFirst("PRETTY_NAME=".count)).replacingOccurrences(of: "\"", with: "") | ||
| } | ||
| } | ||
|
|
||
| guard let id, let versionID else { | ||
| let message = "Unable to find release information from file \(releaseFile)" | ||
| if disableConfirmation { | ||
| throw Error(message: message) | ||
| } else { | ||
| print(message) | ||
| } | ||
| return await self.manualSelectPlatform(platformPretty) | ||
| } | ||
|
|
||
| if (id + (idlike ?? "")).contains("amzn") { | ||
| guard versionID == "2" else { | ||
| let message = "Unsupported version of Amazon Linux" | ||
| if disableConfirmation { | ||
| throw Error(message: message) | ||
| } else { | ||
| print(message) | ||
| } | ||
| return await self.manualSelectPlatform(platformPretty) | ||
| } | ||
|
|
||
| return PlatformDefinition.amazonlinux2 | ||
| } else if (id + (idlike ?? "")).contains("rhel") { | ||
| guard versionID.hasPrefix("9") else { | ||
| let message = "Unsupported version of RHEL" | ||
| if disableConfirmation { | ||
| throw Error(message: message) | ||
| } else { | ||
| print(message) | ||
| } | ||
| return await self.manualSelectPlatform(platformPretty) | ||
| } | ||
|
|
||
| return PlatformDefinition.rhel9 | ||
| } else if let pd = [PlatformDefinition.ubuntu1804, .ubuntu2004, .ubuntu2204, .ubuntu2404, .debian12, .fedora39].first(where: { $0.name == id + versionID }) { | ||
| return pd | ||
| } | ||
|
|
||
| let message = "Unsupported Linux platform" | ||
|
|
@@ -598,7 +616,7 @@ public struct Linux: Platform { | |
| } else { | ||
| print(message) | ||
| } | ||
| return await self.manualSelectPlatform(platformPretty) | ||
| } | ||
|
|
||
| public func getShell() async throws -> String { | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it worth noting here that 23.10 isn't supported for 5.10 releases? technically that is listed on swift.org/download? Just thinking out loud, it doesn't matter much