mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
ci: install packages available only on x86_64/arm64 on those arches only
This commit is contained in:
11
.github/workflows/build_test.sh
vendored
11
.github/workflows/build_test.sh
vendored
@@ -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
|
||||
|
||||
8
.github/workflows/unit_tests.sh
vendored
8
.github/workflows/unit_tests.sh
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user