From 14a6b5feceb5fb324c110a23649892b6331f5ccc Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 3 Jul 2025 22:57:46 +0100 Subject: [PATCH] ci: install packages available only on x86_64/arm64 on those arches only --- .github/workflows/build_test.sh | 11 +++++++++-- .github/workflows/unit_tests.sh | 8 ++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index d070410f80d..2662597b93d 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -43,7 +43,6 @@ PACKAGES=( libqrencode-dev libssl-dev libtss2-dev - libxen-dev libxkbcommon-dev libxtables-dev libzstd-dev @@ -69,6 +68,10 @@ COMPILER_VERSION="${COMPILER_VERSION:?}" LINKER="${LINKER:?}" RELEASE="$(lsb_release -cs)" +if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "x86_64" ]; then + PACKAGES+=(libxen-dev) +fi + # Note: As we use postfixed clang/gcc binaries, we need to override $AR # as well, otherwise meson falls back to ar from binutils which # doesn't work with LTO @@ -109,7 +112,11 @@ elif [[ "$COMPILER" == gcc ]]; then sudo add-apt-repository -y --no-update ppa:ubuntu-toolchain-r/test fi - PACKAGES+=("gcc-$COMPILER_VERSION" "gcc-$COMPILER_VERSION-multilib") + PACKAGES+=("gcc-$COMPILER_VERSION") + if [ "$(uname -m)" = "x86_64" ]; then + # Only needed for ia32 EFI builds + PACKAGES+=("gcc-$COMPILER_VERSION-multilib") + fi else fatal "Unknown compiler: $COMPILER" fi diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index 477995eafa4..7bebea682b3 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -19,12 +19,11 @@ ADDITIONAL_DEPS=( libxkbcommon-dev libzstd-dev python3-libevdev - python3-pefile + python3-pip python3-pyelftools python3-pyparsing python3-pytest rpm - systemd-boot-efi zstd ) @@ -43,6 +42,11 @@ set -ex MESON_ARGS=() +if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "x86_64" ]; then + ADDITIONAL_DEPS+=(python3-pefile) + ADDITIONAL_DEPS+=(systemd-boot-efi) +fi + # (Re)set the current oom-{score-}adj. For some reason root on GH actions is able to _decrease_ # its oom-score even after dropping all capabilities (including CAP_SYS_RESOURCE), until the # score is explicitly changed after sudo. No idea what's going on, but it breaks -- 2.47.3