mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-26 07:04:37 +02:00
GHA: Fix Alpine After CMAKE_OPTS Refactoring
The just merged Alpine CI run for LibreSSL from #9949 failed since it missed the changes of the refactoring PR #10369. This change applied the refactoring for Alpine as well, hopefully making the CI happy.
This commit is contained in:
parent
0673dfa644
commit
33838a620a
5
.github/workflows/linux.bash
vendored
5
.github/workflows/linux.bash
vendored
@ -15,8 +15,6 @@ case "$DISTRO" in
|
|||||||
apk add bison boost-dev ccache cmake flex g++ libedit-dev libressl-dev ninja-build tzdata
|
apk add bison boost-dev ccache cmake flex g++ libedit-dev libressl-dev ninja-build tzdata
|
||||||
ln -vs /usr/lib/ninja-build/bin/ninja /usr/local/bin/ninja
|
ln -vs /usr/lib/ninja-build/bin/ninja /usr/local/bin/ninja
|
||||||
|
|
||||||
CMAKE_OPTS="-DUSE_SYSTEMD=OFF -DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF"
|
|
||||||
|
|
||||||
# This test fails due to some glibc/musl mismatch regarding timezone PST/PDT.
|
# This test fails due to some glibc/musl mismatch regarding timezone PST/PDT.
|
||||||
# - https://www.openwall.com/lists/musl/2024/03/05/2
|
# - https://www.openwall.com/lists/musl/2024/03/05/2
|
||||||
# - https://gitlab.alpinelinux.org/alpine/aports/-/blob/b3ea02e2251451f9511086e1970f21eb640097f7/community/icinga2/disable-failing-tests.patch
|
# - https://gitlab.alpinelinux.org/alpine/aports/-/blob/b3ea02e2251451f9511086e1970f21eb640097f7/community/icinga2/disable-failing-tests.patch
|
||||||
@ -85,6 +83,9 @@ case "$DISTRO" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
case "$DISTRO" in
|
case "$DISTRO" in
|
||||||
|
alpine:*)
|
||||||
|
CMAKE_OPTS+=(-DUSE_SYSTEMD=OFF -DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF)
|
||||||
|
;;
|
||||||
debian:*|ubuntu:*)
|
debian:*|ubuntu:*)
|
||||||
CMAKE_OPTS+=(-DICINGA2_LTO_BUILD=ON)
|
CMAKE_OPTS+=(-DICINGA2_LTO_BUILD=ON)
|
||||||
source <(dpkg-buildflags --export=sh)
|
source <(dpkg-buildflags --export=sh)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user