From 1ccecb09c199a48a6bd59fe221bbc235444882d5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Mon, 1 Jul 2024 12:44:43 +0200
Subject: [PATCH 1/4] GHA: drop EOL EL7

---
 .github/workflows/linux.bash | 12 +-----------
 .github/workflows/linux.yml  |  1 -
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/linux.bash b/.github/workflows/linux.bash
index fe0e7d551..51b978f5c 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 3eda27df2..b7d6269d4 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

From a3f1b912034f670815df56c8bef3ee7f501e8da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?=
 <alexander.klimov@icinga.com>
Date: Mon, 1 Jul 2024 13:29:01 +0200
Subject: [PATCH 2/4] GHA: add openSUSE 15.6 and SLES 15.6

---
 .github/workflows/linux.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b7d6269d4..e47033898 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -32,6 +32,7 @@ jobs:
           - opensuse/leap:15.3 # SLES 15.3
           - opensuse/leap:15.4 # and SLES 15.4
           - opensuse/leap:15.5 # and SLES 15.5
+          - opensuse/leap:15.6 # and SLES 15.6
           - rockylinux:8 # RHEL 8
           - rockylinux:9 # RHEL 9
           - ubuntu:20.04

From a12b501a515147b5b626e87ab7d64155951da94e Mon Sep 17 00:00:00 2001
From: Alvar Penning <alvar.penning@icinga.com>
Date: Wed, 31 Jul 2024 10:23:05 +0200
Subject: [PATCH 3/4] GHA: Unbreak Windows Tests

As seen in the recent GHA run for #10102, the two Windows Actions have
failed. The output log contains:

> DEBUG:   27+  >>>> ctest.exe -C "${env:CMAKE_BUILD_TYPE}" -T test -O $env:ICINGA2_BUILDPATH/Test.xml
> --output-on-failure --log_level=all
> CMake Error: Unknown argument: --log_level=all
> CMake Error: Run 'ctest --help' for all supported options.

After consulting ctest(1), older versions included, I have never found a
mention of the "--log_level" flag. Since the useful
"--output-on-failure" flag is already set, which will "[o]utput anything
outputted by the test program if the test should fail", I do not see any
further reason for more logging information.

This flag was introduced in 7665143afa500dd589546665124293b9c1206265,
but I have not found any reasoning for the flag in particular.
---
 tools/win32/test.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/win32/test.ps1 b/tools/win32/test.ps1
index d7ad90ce2..3d3c12540 100644
--- a/tools/win32/test.ps1
+++ b/tools/win32/test.ps1
@@ -24,7 +24,7 @@ if (-not ($env:PATH -contains $env:CMAKE_PATH)) {
 
 cd "$env:ICINGA2_BUILDPATH"
 
-ctest.exe -C "${env:CMAKE_BUILD_TYPE}" -T test -O $env:ICINGA2_BUILDPATH/Test.xml --output-on-failure --log_level=all
+ctest.exe -C "${env:CMAKE_BUILD_TYPE}" -T test -O $env:ICINGA2_BUILDPATH/Test.xml --output-on-failure
 if ($lastexitcode -ne 0) {
   cd ..
   exit $lastexitcode

From 8c02210e63a1a1df6bdf245071becaa562f2cce0 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 6 Aug 2024 11:32:36 +0200
Subject: [PATCH 4/4] Update AUTHORS

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 790a84752..3c6fb8822 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,7 @@ Alexander Fuhr <alexander.fuhr@netways.de>
 Alexander Schomburg <script.acc@alex.schomb.org>
 Alexander Stoll <astoll@netways.de>
 Alexander Wirt <formorer@debian.org>
+Alvar Penning <alvar.penning@icinga.com>
 Andrea Avancini <andrea.avancini@wuerth-phoenix.com>
 Andrea Kao <eirinikos@gmail.com>
 Andreas Maus <maus@badphish.ypbind.de>