diff --git a/.github/scripts/linux_pre_build.sh b/.github/scripts/linux_pre_build.sh index 8adf2410..fcbf2099 100755 --- a/.github/scripts/linux_pre_build.sh +++ b/.github/scripts/linux_pre_build.sh @@ -31,8 +31,8 @@ if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy # Android NDK dpkg_architecture="$(dpkg --print-architecture)" if [[ "$SKIP_ANDROID" != "1" ]] && [[ "$dpkg_architecture" == amd64 ]] ; then - eval "$(cat /etc/lsb-release)" - case "$DISTRIB_CODENAME" in + eval "$(cat /etc/os-release)" + case "$VERSION_CODENAME" in bookworm|jammy) : # Not available ;; @@ -40,7 +40,7 @@ if command -v apt-get >/dev/null 2>&1 ; then # bookworm, noble, jammy apt-get install -y google-android-ndk-r26c-installer ;; *) - echo "Unknown distribution: $DISTRIB_CODENAME" >&2 + echo "Unable to fetch Android NDK for unknown Linux distribution: $VERSION_CODENAME" >&2 exit 1 esac else diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 106b1ece..a4e48be7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -13,7 +13,7 @@ jobs: name: Test uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main with: - linux_os_versions: '["noble", "jammy", "rhel-ubi9"]' + linux_os_versions: '["amazonlinux2", "bookworm", "noble", "jammy", "rhel-ubi9"]' linux_pre_build_command: ./.github/scripts/linux_pre_build.sh linux_build_command: 'swift test --no-parallel' linux_swift_versions: '["nightly-main", "nightly-6.2"]'