From 7fc60c071fbaeea55518ffbdd3a915c56cdebfb1 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Wed, 23 Mar 2022 14:40:06 +0100 Subject: [PATCH] ci: Add ia32 EFI multilib test This makes sure that building ia32 EFI binaries on x86_64 works. We force gnu-efi support to ensure it's not skipped by accident and provide the lib32 dir manually, because clang does not support '--print-multi-os-directory', which is used to auto-detect it. --- .github/workflows/build_test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 7a27a5f9f12..0c77be2a134 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -9,7 +9,7 @@ success() { echo >&2 -e "\033[32;1m$1\033[0m"; } ARGS=( "--optimization=0" - "--optimization=s" + "--optimization=s -Dgnu-efi=true -Defi-cflags=-m32 -Defi-libdir=/usr/lib32" "--optimization=3 -Db_lto=true -Ddns-over-tls=false" "--optimization=3 -Db_lto=false" "--optimization=3 -Ddns-over-tls=openssl" @@ -27,6 +27,7 @@ PACKAGES=( kbd libblkid-dev libbpf-dev + libc6-dev-i386 libcap-dev libcurl4-gnutls-dev libfdisk-dev @@ -93,7 +94,7 @@ elif [[ "$COMPILER" == gcc ]]; then # Latest gcc stack deb packages provided by # https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test add-apt-repository -y ppa:ubuntu-toolchain-r/test - PACKAGES+=("gcc-$COMPILER_VERSION") + PACKAGES+=("gcc-$COMPILER_VERSION" "gcc-$COMPILER_VERSION-multilib") else fatal "Unknown compiler: $COMPILER" fi -- 2.47.3