From 1883cae4453f9f8611d35e34eecaf907e5cd189b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 18 Apr 2023 15:35:46 +0200 Subject: [PATCH 1/6] GHA: Drop openSUSE 15.3 (EOL) --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6294a5c60..f808cf322 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,7 +27,7 @@ jobs: - debian:11 # and Raspbian 11 - fedora:36 - fedora:37 - - opensuse/leap:15.3 # and SLES 15.3 + - opensuse/leap:15.3 # SLES 15.3 - opensuse/leap:15.4 # and SLES 15.4 - rockylinux:8 # RHEL 8 - rockylinux:9 # RHEL 9 From 286d288654b3d3cde352769e57e4b74d2260266e Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 2 May 2023 15:22:06 +0200 Subject: [PATCH 2/6] GHA: use a CMake version which can set(CMAKE_CXX_STANDARD 17) where possible especially on Amazon Linux which seems to have trouble with our workaround: set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") --- .github/workflows/linux.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.bash b/.github/workflows/linux.bash index 9deae8e74..a17778aba 100755 --- a/.github/workflows/linux.bash +++ b/.github/workflows/linux.bash @@ -9,7 +9,7 @@ CMAKE_OPTS='' case "$DISTRO" in amazonlinux:*) 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,6 +22,7 @@ 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 @@ -29,9 +30,10 @@ case "$DISTRO" in 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' ;; From c0ebdd69d4b07e59314b5f2df79d4535237507e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Wed, 12 Apr 2023 12:12:11 +0200 Subject: [PATCH 3/6] GHA: Linux: add Fedora 38, Ubuntu 23.04 --- .github/workflows/linux.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f808cf322..d2cf5379f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -27,6 +27,7 @@ jobs: - debian:11 # and Raspbian 11 - fedora:36 - fedora:37 + - fedora:38 - opensuse/leap:15.3 # SLES 15.3 - opensuse/leap:15.4 # and SLES 15.4 - rockylinux:8 # RHEL 8 @@ -34,6 +35,7 @@ jobs: - ubuntu:20.04 - ubuntu:22.04 - ubuntu:22.10 + - ubuntu:23.04 steps: - name: Checkout HEAD From 08a8c302f4aebbef642ca76784df7591c52eca53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 4 Jul 2023 11:33:42 +0200 Subject: [PATCH 4/6] GHA: add openSUSE and SLES 15.5 --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d2cf5379f..4150ffd32 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,6 +30,7 @@ jobs: - 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 From 8b9060d77d81c4fb5958ba6a7a461cd96d4d5f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 4 Jul 2023 14:49:32 +0200 Subject: [PATCH 5/6] GHA: add Debian and Raspbian 12 --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4150ffd32..6320faadc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,6 +25,7 @@ jobs: - centos:7 # and RHEL 7 - debian:10 - debian:11 # and Raspbian 11 + - debian:12 # and Raspbian 12 - fedora:36 - fedora:37 - fedora:38 From 51d0e9b5a981c742da8e3c3316745d529ddbb68a Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 6 Jul 2023 14:21:03 +0200 Subject: [PATCH 6/6] GHA: add Amazon Linux 2023 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit which unfortunately seems not to have ccache. 🤷 --- .github/workflows/linux.bash | 9 ++++++--- .github/workflows/linux.yml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) 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