Skip to content

Add support for Amazon Linux 2023 in CI #1501

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

Open
jakepetroules wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for Amazon Linux 2023 in CI #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion .github/scripts/prebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,14 @@ elif command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy
else
echo "Skipping Android NDK installation on $dpkg_architecture" >&2
fi
elif command -v dnf >/dev/null 2>&1 ; then # rhel-ubi9
elif command -v dnf >/dev/null 2>&1 ; then # amazonlinux2023, rhel-ubi9
$sudo dnf update -y

# Build dependencies
$sudo dnf install -y sqlite-devel ncurses-devel python3

# Debug symbols
$sudo dnf install -y 'dnf-command(debuginfo-install)'
$sudo dnf debuginfo-install -y glibc
elif command -v yum >/dev/null 2>&1 ; then # amazonlinux2
$sudo yum update -y
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
needs: [soundness, space-format-check]
with:
enable_cross_pr_testing: true
linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]'
linux_os_versions: '["amazonlinux2", "amazonlinux2023", "bookworm", "noble", "jammy", "rhel-ubi9"]'

@bkhouri bkhouri Jul 2, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: According to https://forums.swift.org/t/dropping-support-for-amazon-linux-2/87920, we should also drop amazonlinux2 support.

@jakepetroules jakepetroules Jul 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was going to do that in a separate PR but I guess I could roll it into this one...

linux_pre_build_command: ./.github/scripts/prebuild.sh
linux_build_command: 'swift test --no-parallel'
linux_swift_versions: '["nightly-main", "nightly-6.3"]'
Comment thread
jakepetroules marked this conversation as resolved.
Expand Down
39 changes: 20 additions & 19 deletions Sources/SWBCore/SpecImplementations/Tools/LinkerTools.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,8 +1922,26 @@ public final class LibtoolLinkerSpec : GenericLinkerSpec, SpecIdentifierType, @u
public func discoveredLinkerToolsInfo(_ producer: any CommandProducer, _ delegate: any CoreClientTargetDiagnosticProducingDelegate, at toolPath: Path) async -> (any DiscoveredCommandLineToolSpecInfo)? {
do {
do {
// -version_details is an Apple ld specific option providing parseable output; try that first
let commandLine = [toolPath.str, "-version_details"]
return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, commandLine, { executionResult in
struct LDVersionDetails: Decodable {
let version: Version
let architectures: Set<String>
}

let details: LDVersionDetails
do {
details = try JSONDecoder().decode(LDVersionDetails.self, from: executionResult.stdout)
} catch {
throw CommandLineOutputJSONParsingError(commandLine: commandLine, data: executionResult.stdout, hostOS: producer.hostOperatingSystem)
}

return DiscoveredLdLinkerToolSpecInfo(linker: .ld64, toolPath: toolPath, toolVersion: details.version, architectures: details.architectures)
})
} catch let e as CommandLineOutputJSONParsingError {
let vCommandLine = [toolPath.str, "-v"]
return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, vCommandLine, { executionResult in
let gnuLD = [
#/GNU ld version (?<version>[\d.]+)-.*/#,
#/GNU ld \(GNU Binutils.*\) (?<version>[\d.]+)/#,
Expand All @@ -1934,8 +1952,8 @@ public func discoveredLinkerToolsInfo(_ producer: any CommandProducer, _ delegat

let goLD = [
#/GNU gold version (?<version>[\d.]+)-.*/#,
#/GNU gold \(GNU Binutils.*\) (?<version>[\d.]+)/#, // Ubuntu "GNU gold (GNU Binutils for Ubuntu 2.38) 1.16", Debian "GNU gold (GNU Binutils for Debian 2.40) 1.16"
#/GNU gold \(version .*\) (?<version>[\d.]+)/#, // Fedora "GNU gold (version 2.40-14.fc39) 1.16", RHEL "GNU gold (version 2.35.2-54.el9) 1.16", Amazon "GNU gold (version 2.29.1-31.amzn2.0.1) 1.14"
#/GNU gold \(GNU Binutils.*\) (?<version>[\d.]+)/#, // Ubuntu "GNU gold (GNU Binutils for Ubuntu 2.38) 1.16", Debian "GNU gold (GNU Binutils for Debian 2.40) 1.16"
#/GNU gold \(version .*\) (?<version>[\d.]+)/#, // Fedora "GNU gold (version 2.40-14.fc39) 1.16", RHEL "GNU gold (version 2.35.2-54.el9) 1.16", Amazon "GNU gold (version 2.29.1-31.amzn2.0.1) 1.14"
]

if let match = try goLD.compactMap({ try $0.firstMatch(in: String(decoding: executionResult.stdout, as: UTF8.self)) }).first {
Expand All @@ -1950,23 +1968,6 @@ public func discoveredLinkerToolsInfo(_ producer: any CommandProducer, _ delegat
return DiscoveredLdLinkerToolSpecInfo(linker: .linkExe, toolPath: toolPath, toolVersion: try Version(String(match.output.version)), architectures: Set())
}

struct LDVersionDetails: Decodable {
let version: Version
let architectures: Set<String>
}

let details: LDVersionDetails
do {
details = try JSONDecoder().decode(LDVersionDetails.self, from: executionResult.stdout)
} catch {
throw CommandLineOutputJSONParsingError(commandLine: commandLine, data: executionResult.stdout, hostOS: producer.hostOperatingSystem)
}

return DiscoveredLdLinkerToolSpecInfo(linker: .ld64, toolPath: toolPath, toolVersion: details.version, architectures: details.architectures)
})
} catch let e as CommandLineOutputJSONParsingError {
let vCommandLine = [toolPath.str, "-v"]
return try await producer.discoveredCommandLineToolSpecInfo(delegate, nil, vCommandLine, { executionResult in
let lld = [
#/LLD (?<version>[\d.]+).*/#,
]
Expand Down
13 changes: 9 additions & 4 deletions Sources/SWBTestSupport/SkippedTestSupport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ extension Trait where Self == Testing.ConditionTrait {
}
}

package static func requireSystemPackages(apt: String..., yum: String..., freebsd: String..., openbsd: String..., sourceLocation: SourceLocation = #_sourceLocation) -> Self {
package static func requireSystemPackages(apt: String..., dnf: String..., freebsd: String..., openbsd: String..., sourceLocation: SourceLocation = #_sourceLocation) -> Self {
enabled("required system packages are not installed") {
func installCommand(packageManagerPath: Path, packageNames: String) -> String {
switch packageManagerPath.basenameWithoutSuffix {
Expand Down Expand Up @@ -272,14 +272,19 @@ extension Trait where Self == Testing.ConditionTrait {

let apt = try await checkInstalled(hostOS: .linux, packageManagerPath: Path("/usr/bin/apt"), args: ["list", "--installed", "apt"], packages: apt, regex: #/(?<name>.+)\//#)

// spelled `--installed` in newer versions of yum, but Amazon Linux 2 is on older versions
let yum = try await checkInstalled(hostOS: .linux, packageManagerPath: Path("/usr/bin/yum"), args: ["list", "installed", "yum"], packages: yum, regex: #/(?<name>.+)\./#)
let dnf = try await {
guard localFS.exists(Path("/usr/bin/dnf")) else {
// spelled `--installed` in newer versions of yum, but Amazon Linux 2 is on older versions
return try await checkInstalled(hostOS: .linux, packageManagerPath: Path("/usr/bin/yum"), args: ["list", "installed", "yum"], packages: dnf, regex: #/(?<name>.+)\./#)
}
return try await checkInstalled(hostOS: .linux, packageManagerPath: Path("/usr/bin/dnf"), args: ["list", "--installed", "dnf"], packages: dnf, regex: #/(?<name>.+)\./#)
}()

let freebsd = try await checkInstalled(hostOS: .freebsd, packageManagerPath: Path("/usr/sbin/pkg"), args: ["info"], packages: freebsd, regex: #/^Name(?:[ ]+): (?<name>.+)$/#)

let openbsd = try await checkInstalled(hostOS: .openbsd, packageManagerPath: Path("/usr/sbin/pkg_info"), args: ["-A"], packages: openbsd, regex: #/^(?<name>.+)-.*/#)

return apt && yum && freebsd && openbsd
return apt && dnf && freebsd && openbsd
}
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/SWBBuildSystemTests/BuildOperationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ fileprivate struct BuildOperationTests: CoreBasedTests {
}

/// Check that environment variables are propagated from the user environment correctly.
@Test(.requireSDKs(.host), .skipHostOS(.windows), .requireSystemPackages(apt: "yacc", yum: "byacc"))
@Test(.requireSDKs(.host), .skipHostOS(.windows), .requireSystemPackages(apt: "yacc", dnf: "byacc"))
func userEnvironment() async throws {
try await withTemporaryDirectory { tmpDirPath async throws -> Void in
let testWorkspace = TestWorkspace(
Expand Down Expand Up @@ -2902,7 +2902,7 @@ That command depends on command in Target 'agg2' (project \'aProject\'): script
}

/// Check non-UTF8 encoded shell scripts don't cause any unexpected issues.
@Test(.requireSDKs(.host), .skipHostOS(.windows), .requireSystemPackages(apt: "xxd", yum: "vim-common", freebsd: "xxd", openbsd: "vim"))
@Test(.requireSDKs(.host), .skipHostOS(.windows), .requireSystemPackages(apt: "xxd", dnf: "vim-common", freebsd: "xxd", openbsd: "vim"))
func nonUTF8ShellScript() async throws {
try await withTemporaryDirectory { tmpDir in
let testWorkspace = TestWorkspace(
Expand Down
2 changes: 1 addition & 1 deletion Tests/SWBCoreTests/CommandLineToolSpecDiscoveredInfoTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ import SWBMacro
}
}

@Test(.skipHostOS(.windows), .requireSystemPackages(apt: "libtool", yum: "libtool", freebsd: "libtool", openbsd: "libtool"))
@Test(.skipHostOS(.windows), .requireSystemPackages(apt: "libtool", dnf: "libtool", freebsd: "libtool", openbsd: "libtool"))
func discoveredLibtoolSpecInfo() async throws {
try await withSpec(LibtoolLinkerSpec.self, .deferred) { (info: DiscoveredLibtoolLinkerToolSpecInfo) in
#expect(info.toolPath.basename == "libtool")
Expand Down
Loading