From c17f57a2be18f65e36dd1b8e334b8d2044d9661e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Mon, 24 Feb 2025 10:02:31 +0100 Subject: [PATCH 1/2] CI: trigger on pushes to `main` branch only --- .github/workflows/differential-shellcheck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml index aba3ffa..e9353cb 100644 --- a/.github/workflows/differential-shellcheck.yml +++ b/.github/workflows/differential-shellcheck.yml @@ -3,6 +3,7 @@ name: Differential ShellCheck on: push: + branches: [ main ] pull_request: branches: [ main ] From c24a929b6c2db6ed950a6d1390d5603fd91bb0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Mon, 24 Feb 2025 09:49:11 +0100 Subject: [PATCH 2/2] cmake: fix build failure in epel7 buildroot Fixes: commit 9878741c0aba13cb49bb25f7414f5ed93abe139f Related: https://github.com/csutils/csdiff/pull/218 Closes: https://github.com/csutils/csdiff/pull/221 --- src/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5d04096..5406858 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,9 +34,14 @@ if(SANITIZERS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize-recover=all") endif() +# Disable deprecated internal FindBoost module if possible. +if(POLICY CMP0167) + cmake_policy(SET CMP0167 NEW) +endif() + # find Boost set(Boost_VERBOSE TRUE) -find_package(Boost CONFIG REQUIRED +find_package(Boost REQUIRED COMPONENTS filesystem program_options regex @@ -127,7 +132,7 @@ macro(build_pycsdiff version) # find boost_python${version} set(PYTHON_VERSION_SUFFIX "${version}${Python${version}_VERSION_MINOR}") - find_package(Boost CONFIG REQUIRED COMPONENTS python${PYTHON_VERSION_SUFFIX}) + find_package(Boost REQUIRED COMPONENTS python${PYTHON_VERSION_SUFFIX}) message(STATUS "Python ${version} binding enabled. " "The pycsdiff module will be built!")