From 9878741c0aba13cb49bb25f7414f5ed93abe139f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Wed, 5 Feb 2025 12:46:01 +0100
Subject: [PATCH 1/2] cmake: use upstream BoostConfig.cmake unconditionally

Fixes the following deprecation warning:
```
CMake Warning (dev) at src/CMakeLists.txt:38 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```
---
 src/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3104f96d..5d040968 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,7 +35,8 @@ if(SANITIZERS)
 endif()
 
 # find Boost
-find_package(Boost REQUIRED
+set(Boost_VERBOSE TRUE)
+find_package(Boost CONFIG REQUIRED
     COMPONENTS filesystem
                program_options
                regex
@@ -126,7 +127,7 @@ macro(build_pycsdiff version)
 
     # find boost_python${version}
     set(PYTHON_VERSION_SUFFIX "${version}${Python${version}_VERSION_MINOR}")
-    find_package(Boost REQUIRED COMPONENTS python${PYTHON_VERSION_SUFFIX})
+    find_package(Boost CONFIG REQUIRED COMPONENTS python${PYTHON_VERSION_SUFFIX})
     message(STATUS "Python ${version} binding enabled. "
         "The pycsdiff module will be built!")
 

From ebea65c1bcd21365e66df34cf3894a6b0fa663ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= <lzaoral@redhat.com>
Date: Wed, 5 Feb 2025 13:15:40 +0100
Subject: [PATCH 2/2] ci: add Ubuntu 24.04 jobs

---
 .github/workflows/ubuntu.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index de8e6b48..1011ffef 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -9,12 +9,12 @@ on:
 
 jobs:
   ubuntu:
-    name: Ubuntu ${{ matrix.version }} (${{ matrix.compiler }}${{ matrix.version == 22.04 && ' with sanitizers' || '' }})
+    name: Ubuntu ${{ matrix.version }} (${{ matrix.compiler }}${{ matrix.version == 24.04 && ' with sanitizers' || '' }})
     strategy:
       fail-fast: false
       matrix:
         compiler: [clang++, g++]
-        version: [20.04, 22.04]
+        version: [20.04, 22.04, 24.04]
 
     runs-on: ubuntu-${{ matrix.version }}
     env:
@@ -39,7 +39,9 @@ jobs:
 
       - name: Build and check
         run: |
-          if [[ "${{ matrix.version }}" == 22.04 ]]; then
+          if [[ "${{ matrix.version }}" == 24.04 ]]; then
+            # -Werror causes false positives with sanitizers and modern GCC
+            [[ "${{ matrix.compiler }}" == g++ ]] && export CXXFLAGS=
             make distcheck-sanitizers
           else
             make distcheck