Skip to content

Commit 291f797

Browse files
committed
Map Amazon Linux 2023 to amazonlinux2023 toolchain infix
Amazon Linux 2023 reports ID=amzn and VERSION_ID=2023 in /etc/os-release. This combination fell through to the generic else branch, producing the OS name amzn2023 and thus an invalid Swift toolchain download URL (swift-...-amzn2023-aarch64.tar.gz), causing a "Toolchain not found" failure. Special-case it to the amazonlinux2023 infix that swift.org actually publishes.
1 parent 1d53238 commit 291f797

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/pull_request.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ jobs:
2525
uses: ./.github/workflows/swift_package_test.yml
2626
with:
2727
# Linux
28-
linux_os_versions: '["jammy", "rhel-ubi9"]'
28+
linux_os_versions: '["jammy", "rhel-ubi9", "amazonlinux2023"]'
29+
# Amazon Linux 2023 images are only available for Swift 6.3 and later.
30+
linux_exclude_swift_versions: '[{"swift_version": "5.9", "os_version": "amazonlinux2023"}, {"swift_version": "5.10", "os_version": "amazonlinux2023"}, {"swift_version": "6.0", "os_version": "amazonlinux2023"}, {"swift_version": "6.1", "os_version": "amazonlinux2023"}, {"swift_version": "6.2", "os_version": "amazonlinux2023"}]'
2931
linux_host_archs: '["x86_64", "aarch64"]'
3032
linux_build_command: |
3133
cd tests/TestPackage

.github/workflows/scripts/install-and-build-with-sdk.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@ initialize_os_info() {
485485
elif [[ "$os_id" == "amzn" && "$version_id" == "2" ]]; then
486486
OS_NAME="amazonlinux2"
487487
OS_NAME_NO_DOT="amazonlinux2"
488+
elif [[ "$os_id" == "amzn" && "$version_id" == "2023" ]]; then
489+
OS_NAME="amazonlinux2023"
490+
OS_NAME_NO_DOT="amazonlinux2023"
488491
else
489492
# Ubuntu, Debian, Fedora
490493
OS_NAME="${os_id}${version_id}"

0 commit comments

Comments
 (0)