From 784b55df1b8babca7921298410a0c6051b5fac99 Mon Sep 17 00:00:00 2001 From: broken-circle <252359939+broken-circle@users.noreply.github.com> Date: Wed, 1 Jul 2026 13:09:14 -0700 Subject: [PATCH 1/2] Remove Amazon Linux 2 from CI Amazon Linux 2 reached end of life on 2026-06-30, and Swift.org has stopped publishing the nightly toolchains for main and release/6.4.x. The static Linux SDK build on the amazonlinux2 host now fails. Remove it from CI, and also remove the now-dead yum branch from the pre-build command, since Amazon Linux 2 was the only distribution in the matrix that used yum. --- .github/workflows/pull_request.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 14ff68ec..1ecaea13 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: - linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]' + linux_os_versions: '["bookworm", "noble", "jammy", "rhel-ubi9"]' linux_swift_versions: '["6.2", "nightly-main"]' linux_pre_build_command: | if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy @@ -29,11 +29,6 @@ jobs: # Test dependencies dnf install -y procps - elif command -v yum >/dev/null 2>&1 ; then # amazonlinux2 - yum update -y - - # Test dependencies - yum install -y procps fi linux_build_command: "swift test && swift test -c release && swift test --disable-default-traits" enable_freebsd_checks: true From eec7e5885abfabc2663accf8cd8e22d92beb1c2b Mon Sep 17 00:00:00 2001 From: broken-circle <252359939+broken-circle@users.noreply.github.com> Date: Wed, 1 Jul 2026 13:13:02 -0700 Subject: [PATCH 2/2] Add Amazon Linux 2023 to CI Amazon Linux 2023 can't be added to `linux_os_versions` directly: it is crossed with `linux_swift_versions`, and there is no `swift:6.2-amazonlinux2023` image, so a 6.2 cell fails to pull. Run it as a standalone job pinned to nightly-main instead. Coverage is intentionally partial: nightly-main only, native test only. The static Linux SDK build is omitted; it cross-compiles to musl, so the host OS adds little coverage, and the nightly-main static-SDK cell additionally hit a toolchain-snapshot skew. --- .github/workflows/pull_request.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 1ecaea13..dedd58ea 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: - linux_os_versions: '["bookworm", "noble", "jammy", "rhel-ubi9"]' + linux_os_versions: '["amazonlinux2023", "bookworm", "noble", "jammy", "rhel-ubi9"]' linux_swift_versions: '["6.2", "nightly-main"]' linux_pre_build_command: | if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy @@ -24,12 +24,14 @@ jobs: apt-get update -y apt-get install -y procps fi - elif command -v dnf >/dev/null 2>&1 ; then # rhel-ubi9 + elif command -v dnf >/dev/null 2>&1 ; then # amazonlinux2023, rhel-ubi9 dnf update -y # Test dependencies dnf install -y procps fi + linux_exclude_swift_versions: '[{"swift_version": "6.2", "os_version": "amazonlinux2023"}]' + linux_static_sdk_exclude_swift_versions: '[{"swift_version": "6.2", "os_version": "amazonlinux2023"}, {"swift_version": "nightly-main", "os_version": "amazonlinux2023"}]' linux_build_command: "swift test && swift test -c release && swift test --disable-default-traits" enable_freebsd_checks: true freebsd_build_command: "swift test && swift test -c release && swift test --disable-default-traits"