diff --git a/.github/workflows/linux.bash b/.github/workflows/linux.bash index 9deae8e74..fe0e7d551 100755 --- a/.github/workflows/linux.bash +++ b/.github/workflows/linux.bash @@ -7,9 +7,9 @@ export CTEST_OUTPUT_ON_FAILURE=1 CMAKE_OPTS='' case "$DISTRO" in - amazonlinux:*) + amazonlinux:2) amazon-linux-extras install -y epel - yum install -y bison ccache cmake gcc-c++ flex ninja-build \ + yum install -y bison ccache cmake3 gcc-c++ flex ninja-build \ {libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel yum install -y bzip2 tar wget @@ -22,16 +22,23 @@ case "$DISTRO" in ./b2 ) + ln -vs /usr/bin/cmake3 /usr/local/bin/cmake ln -vs /usr/bin/ninja-build /usr/local/bin/ninja CMAKE_OPTS='-DBOOST_INCLUDEDIR=/boost_1_69_0 -DBOOST_LIBRARYDIR=/boost_1_69_0/stage/lib' export LD_LIBRARY_PATH=/boost_1_69_0/stage/lib ;; + amazonlinux:20*) + dnf install -y bison cmake flex gcc-c++ ninja-build \ + {boost,libedit,mariadb1\*,ncurses,openssl,postgresql,systemd}-devel + ;; + centos:*) yum install -y centos-release-scl epel-release - yum install -y bison ccache cmake devtoolset-11-gcc-c++ flex ninja-build \ + yum install -y bison ccache cmake3 devtoolset-11-gcc-c++ flex ninja-build \ {boost169,libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel + ln -vs /usr/bin/cmake3 /usr/local/bin/cmake ln -vs /usr/bin/ccache /usr/lib64/ccache/g++ CMAKE_OPTS='-DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169' ;; @@ -81,9 +88,7 @@ cmake \ -DICINGA2_GROUP=$(id -gn) \ $CMAKE_OPTS .. -ccache -z ninja -ccache -s ninja test ninja install diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6294a5c60..be238b170 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -22,18 +22,23 @@ jobs: matrix: distro: - amazonlinux:2 + - amazonlinux:2023 - centos:7 # and RHEL 7 - debian:10 - debian:11 # and Raspbian 11 + - debian:12 # and Raspbian 12 - fedora:36 - fedora:37 - - opensuse/leap:15.3 # and SLES 15.3 + - fedora:38 + - opensuse/leap:15.3 # SLES 15.3 - opensuse/leap:15.4 # and SLES 15.4 + - opensuse/leap:15.5 # and SLES 15.5 - rockylinux:8 # RHEL 8 - rockylinux:9 # RHEL 9 - ubuntu:20.04 - ubuntu:22.04 - ubuntu:22.10 + - ubuntu:23.04 steps: - name: Checkout HEAD