From 6ba41b01e406404901ead7377fcd442108cf23d4 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 18 Jan 2024 17:22:35 +0100 Subject: [PATCH 1/6] GHA AUTHORS check: handle PRs from forks where the ref names differ compared to own PRs. Instead refer to the base branch and the head branch via generic HEAD^ where HEAD is a merge commit. --- .github/workflows/authors-file.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/authors-file.yml b/.github/workflows/authors-file.yml index 3970aee68..9e13ab686 100644 --- a/.github/workflows/authors-file.yml +++ b/.github/workflows/authors-file.yml @@ -20,8 +20,8 @@ jobs: sort -uo AUTHORS AUTHORS git add AUTHORS git log --format='format:%aN <%aE>' "$( - git merge-base "origin/$GITHUB_BASE_REF" "origin/$GITHUB_HEAD_REF" - )..origin/$GITHUB_HEAD_REF" >> AUTHORS + git merge-base HEAD^1 HEAD^2 + )..HEAD^2" >> AUTHORS sort -uo AUTHORS AUTHORS git diff AUTHORS >> AUTHORS.diff From a00e57c06be4c31781a3b208abd10405e44e6270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 16 Apr 2024 10:38:17 +0200 Subject: [PATCH 2/6] GHA: add upcoming Ubuntu 24.04 --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6c3c5dd6e..78ee939e0 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,6 +39,7 @@ jobs: - ubuntu:22.04 - ubuntu:23.04 - ubuntu:23.10 + - ubuntu:24.04 steps: - name: Checkout HEAD From 00d77443a0682d13ef619dd9dfc7822ee1c6778a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 16 Apr 2024 10:38:27 +0200 Subject: [PATCH 3/6] GHA: add upcoming Fedora 40 --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 78ee939e0..0eaaae6d5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -30,6 +30,7 @@ jobs: - fedora:37 - fedora:38 - fedora:39 + - fedora:40 - opensuse/leap:15.3 # SLES 15.3 - opensuse/leap:15.4 # and SLES 15.4 - opensuse/leap:15.5 # and SLES 15.5 From 469bc7e9fd8b06eda2ee668715345a40054f51bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Tue, 16 Apr 2024 16:09:06 +0200 Subject: [PATCH 4/6] GHA: drop Debian 10 which will be EOL in 2.5 months. --- .github/workflows/linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 0eaaae6d5..3eda27df2 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -24,7 +24,6 @@ jobs: - amazonlinux:2 - amazonlinux:2023 - centos:7 # and RHEL 7 - - debian:10 - debian:11 # and Raspbian 11 - debian:12 # and Raspbian 12 - fedora:37 From 8b6c73166c31668d7b53753dbb11dbec58ea564a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Fri, 19 Apr 2024 11:50:13 +0200 Subject: [PATCH 5/6] GHA: Docker: don't run on support/* branches PRs to them are already covered and we don't need support* image tags. --- .github/workflows/docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dc23459e0..575db1c68 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,7 +5,6 @@ on: push: branches: - master - - 'support/*' release: types: - published From 39be31c305607430b0d4a6d0136e855a89f1b1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Aleksandrovi=C4=8D=20Klimov?= Date: Thu, 4 Apr 2024 17:53:42 +0200 Subject: [PATCH 6/6] CMakeLists.txt: set(CPACK_WIX_INSTALL_SCOPE NONE) to stick to CMake pre-v3.29 behavior. CMake v3.29 introduces CPACK_WIX_INSTALL_SCOPE. Its default conflicts with the ALLUSERS property in our icinga-installer/icinga2.wixpatch.cmake. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3cb26f38..52fa1d868 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,6 +506,7 @@ set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/icinga-installer/dlgbmp.bmp set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch.Debug") set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_BINARY_DIR}/icinga-installer/icinga2.wixpatch") set(CPACK_WIX_EXTENSIONS "WixUtilExtension" "WixNetFxExtension") +set(CPACK_WIX_INSTALL_SCOPE NONE) set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "sbin") set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)