Skip to content
Open
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
2 changes: 1 addition & 1 deletion Sources/GeneratorCLI/GeneratorCLI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ extension GeneratorCLI {
var swiftBranch: String? = nil

@Option(help: "Version of Swift to supply in the bundle.")
var swiftVersion = "6.1.2-RELEASE"
var swiftVersion = "6.2-RELEASE"

@Option(
help: """
Expand Down
138 changes: 138 additions & 0 deletions Tests/SwiftSDKGeneratorTests/EndToEndTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,63 @@ final class Swift61_UbuntuEndToEndTests: XCTestCase {
)
}
}
final class Swift62_UbuntuEndToEndTests: XCTestCase {
let config = SDKConfiguration(
swiftVersion: "6.2",
linuxDistributionName: "ubuntu",
linuxDistributionVersion: "24.04",
architecture: "aarch64",
withDocker: false
)

func testAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("aarch64"))
}

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

func testAarch64FromContainer() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
}

func testX86_64FromContainer() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
}

func testJammyAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withArchitecture("aarch64").withLinuxDistributionVersion("22.04")
)
}

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

func testJammyAarch64FromContainer() async throws {
try skipSlow()
try await buildTestcases(
config: config.withArchitecture("aarch64").withLinuxDistributionVersion("22.04").withDocker()
)
}

func testJammyX86_64FromContainer() async throws {
try skipSlow()
try await buildTestcases(
config: config.withArchitecture("x86_64").withLinuxDistributionVersion("22.04").withDocker()
)
}
}

final class Swift59_DebianEndToEndTests: XCTestCase {
let config = SDKConfiguration(
Expand Down Expand Up @@ -720,6 +777,53 @@ final class Swift61_DebianEndToEndTests: XCTestCase {
// generating this container for you automatically, so we do not test this scenario.
}

final class Swift62_DebianEndToEndTests: XCTestCase {
let config = SDKConfiguration(
swiftVersion: "6.2",
linuxDistributionName: "debian",
linuxDistributionVersion: "12",
architecture: "aarch64",
withDocker: false
)

func testBookwormAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("aarch64"))
}

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

func testBookwormAarch64FromContainer() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("aarch64").withDocker())
}

func testBookwormX86_64FromContainer() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("x86_64").withDocker())
}

func testBullseyeAarch64Direct() async throws {
try skipSlow()
try await buildTestcases(
config: config.withLinuxDistributionVersion("11").withArchitecture("aarch64")
)
}

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

// 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.
}

final class Swift59_RHELEndToEndTests: XCTestCase {
let config = SDKConfiguration(
swiftVersion: "5.9.2",
Expand Down Expand Up @@ -883,3 +987,37 @@ final class Swift61_RHELEndToEndTests: XCTestCase {
)
}
}

final class Swift62_RHELEndToEndTests: XCTestCase {
let config = SDKConfiguration(
swiftVersion: "6.2",
linuxDistributionName: "rhel",
linuxDistributionVersion: "ubi9",
architecture: "aarch64",
withDocker: true // RHEL-based SDKs can only be built from containers
)

func testAarch64FromContainer() async throws {
try skipSlow()
try await buildTestcases(config: config.withArchitecture("aarch64"))
}

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

func testAmazonLinux2Aarch64FromContainer() async throws {
try skipSlow()
try await buildTestcases(
config: config.withArchitecture("aarch64").withContainerImageSuffix("amazonlinux2")
)
}

func testAmazonLinux2X86_64FromContainer() async throws {
try skipSlow()
try await buildTestcases(
config: config.withArchitecture("x86_64").withContainerImageSuffix("amazonlinux2")
)
}
}