diff --git a/.github/workflows/linux.bash b/.github/workflows/linux.bash index a17778aba..fe0e7d551 100755 --- a/.github/workflows/linux.bash +++ b/.github/workflows/linux.bash @@ -7,7 +7,7 @@ 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 cmake3 gcc-c++ flex ninja-build \ {libedit,mariadb,ncurses,openssl,postgresql,systemd}-devel @@ -28,6 +28,11 @@ case "$DISTRO" in 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 cmake3 devtoolset-11-gcc-c++ flex ninja-build \ @@ -83,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 6320faadc..be238b170 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -22,6 +22,7 @@ jobs: matrix: distro: - amazonlinux:2 + - amazonlinux:2023 - centos:7 # and RHEL 7 - debian:10 - debian:11 # and Raspbian 11