From 33838a620a0712f666da9499cd77367a5116fa38 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 3 Apr 2025 09:33:42 +0200 Subject: [PATCH] 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. --- .github/workflows/linux.bash | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.bash b/.github/workflows/linux.bash index ec53adabe..6c4240d1a 100755 --- a/.github/workflows/linux.bash +++ b/.github/workflows/linux.bash @@ -15,8 +15,6 @@ case "$DISTRO" in 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 - 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. # - https://www.openwall.com/lists/musl/2024/03/05/2 # - https://gitlab.alpinelinux.org/alpine/aports/-/blob/b3ea02e2251451f9511086e1970f21eb640097f7/community/icinga2/disable-failing-tests.patch @@ -85,6 +83,9 @@ case "$DISTRO" in esac case "$DISTRO" in + alpine:*) + CMAKE_OPTS+=(-DUSE_SYSTEMD=OFF -DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF) + ;; debian:*|ubuntu:*) CMAKE_OPTS+=(-DICINGA2_LTO_BUILD=ON) source <(dpkg-buildflags --export=sh)