Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,13 @@ public enum LinuxDistribution: Hashable, Sendable {
public enum Debian: String, Sendable {
case bullseye
case bookworm
case trixie

init(version: String) throws {
switch version {
case "11": self = .bullseye
case "12": self = .bookworm
case "13": self = .trixie
default:
throw GeneratorError.unknownLinuxDistribution(
name: LinuxDistribution.Name.debian.rawValue,
Expand All @@ -110,6 +112,7 @@ public enum LinuxDistribution: Hashable, Sendable {
switch self {
case .bullseye: return "11"
case .bookworm: return "12"
case .trixie: return "13"
}
}

Expand Down Expand Up @@ -142,6 +145,13 @@ public enum LinuxDistribution: Hashable, Sendable {
"libicu-dev",
"libstdc++-12-dev",
]
case .trixie:
return commonPackages + [
"libgcc-14-dev",
"libicu76",
"libicu-dev",
"libstdc++-14-dev",
]
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public struct VersionsConfiguration: Sendable {
} else if self.swiftVersion.hasPrefix("5.9") || self.swiftVersion == "5.10" {
// Ubuntu 22.04 toolchain is binary compatible with Debian 12
return "ubuntu22.04"
} else if debian.version == "13" {
// Ubuntu 24.04 toolchain is binary compatible with Debian 13
return "ubuntu24.04"
}
return "debian\(debian.version)"
case let .rhel(rhel):
Expand Down
72 changes: 64 additions & 8 deletions Tests/SwiftSDKGeneratorTests/EndToEndTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,22 @@ final class Swift510_DebianEndToEndTests: XCTestCase {
)
}

// NOTE: Debian 11 containers do not exist for Swift, and the generator does not support
// generating this container for you automatically, so we do not test this scenario.
func testTrixieAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("aarch64")
)
}

func testTrixieX86_64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("x86_64")
)
}

// NOTE: Debian 11 and 13 containers do not exist for Swift, and the generator does not
// support creating this container for you automatically, so we do not test this scenario.
}

final class Swift60_DebianEndToEndTests: XCTestCase {
Expand Down Expand Up @@ -726,8 +740,22 @@ final class Swift60_DebianEndToEndTests: XCTestCase {
)
}

// NOTE: Debian 11 containers do not exist for Swift, and the generator does not support
// generating this container for you automatically, so we do not test this scenario.
func testTrixieAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("aarch64")
)
}

func testTrixieX86_64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("x86_64")
)
}

// NOTE: Debian 11 and 13 containers do not exist for Swift, and the generator does not
// support creating this container for you automatically, so we do not test this scenario.
}

final class Swift61_DebianEndToEndTests: XCTestCase {
Expand Down Expand Up @@ -773,8 +801,22 @@ final class Swift61_DebianEndToEndTests: XCTestCase {
)
}

// NOTE: Debian 11 containers do not exist for Swift, and the generator does not support
// generating this container for you automatically, so we do not test this scenario.
func testTrixieAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("aarch64")
)
}

func testTrixieX86_64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("x86_64")
)
}

// NOTE: Debian 11 and 13 containers do not exist for Swift, and the generator does not
// support creating this container for you automatically, so we do not test this scenario.
}

final class Swift62_DebianEndToEndTests: XCTestCase {
Expand Down Expand Up @@ -820,8 +862,22 @@ final class Swift62_DebianEndToEndTests: XCTestCase {
)
}

// NOTE: Debian 11 containers do not exist for Swift, and the generator does not support
// generating this container for you automatically, so we do not test this scenario.
func testTrixieAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("aarch64")
)
}

func testTrixieX86_64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("13").withArchitecture("x86_64")
)
}

// NOTE: Debian 11 and 13 containers do not exist for Swift, and the generator does not
// support creating this container for you automatically, so we do not test this scenario.
}

final class Swift59_RHELEndToEndTests: XCTestCase {
Expand Down