diff --git a/.github/workflows/linux.bash b/.github/workflows/linux.bash index fe0e7d551a8..51b978f5c80 100755 --- a/.github/workflows/linux.bash +++ b/.github/workflows/linux.bash @@ -1,7 +1,7 @@ #!/bin/bash set -exo pipefail -export PATH="/usr/lib/ccache:/usr/lib64/ccache:/opt/rh/devtoolset-11/root/usr/bin:$PATH" +export PATH="/usr/lib/ccache:/usr/lib64/ccache:$PATH" export CCACHE_DIR=/icinga2/ccache export CTEST_OUTPUT_ON_FAILURE=1 CMAKE_OPTS='' @@ -33,16 +33,6 @@ case "$DISTRO" in {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 \ - {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' - ;; - debian:*|ubuntu:*) apt-get update DEBIAN_FRONTEND=noninteractive apt-get install --no-install-{recommends,suggests} -y bison \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3eda27df270..b7d6269d41e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -23,7 +23,6 @@ jobs: distro: - amazonlinux:2 - amazonlinux:2023 - - centos:7 # and RHEL 7 - debian:11 # and Raspbian 11 - debian:12 # and Raspbian 12 - fedora:37