Fix warning and errors on CI

intel · Feb 4, 2025 · 8bd0e38 · 8bd0e38
1 parent e6c9d88
commit 8bd0e38
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -26,7 +26,7 @@ permissions:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: read
       contents: read
@@ -39,6 +39,9 @@ jobs:
         # CodeQL supports [ $supported-codeql-languages ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
+    env:
+      PYTHON_BINDING_VERSION: "3.10"
+
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # main

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   dependency-review:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2

diff --git a/.github/workflows/install_dependencies.sh b/.github/workflows/install_dependencies.sh
@@ -50,12 +50,12 @@ if [[ "${BUILD_DOCU}x" != "x" ]]; then
 fi
 
 if (( IS_UBUNTU_20_04 && IS_PYTHON_3_10 )); then
-  echo "!!!!!!! Ubunut 20.04 and python 3.10: compile boost 1.80 !!!!!!!"
+  echo "!!!!!!! Ubunut 20.04 and python 3.10: compile boost 1.78 !!!!!!!"
   pushd dependencies
 
   BOOST_VERSION=1.78.0
   BOOST_PACKAGE_BASENAME=boost_${BOOST_VERSION//./_}
-  wget "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz"
+  wget "https://archives.boost.io/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz"
 
   tar -xzf ${BOOST_PACKAGE_BASENAME}.tar.gz
   pushd ${BOOST_PACKAGE_BASENAME}
@@ -85,4 +85,4 @@ if (( IS_UBUNTU_20_04 && IS_PYTHON_3_10 )); then
 fi
 
 sudo apt remove python3-pygments
-sudo pip${PYTHON_BINDING_VERSION} install -r .github/workflows/requirements.txt
+sudo python${PYTHON_BINDING_VERSION} -m pip install -r .github/workflows/requirements.txt
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -20,7 +20,7 @@ permissions: read-all
 jobs:
   analysis:
     name: Scorecard analysis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       # Needed to upload the results to code-scanning dashboard.
       security-events: write

diff --git a/ad_rss/CMakeLists.txt b/ad_rss/CMakeLists.txt
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: LGPL-2.1-only
 #
 # ----------------- END LICENSE BLOCK -----------------------------------
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 
 include(../cmake/ad-rss-lib-version.cmake)
 project(ad_rss VERSION ${AD-RSS-LIB_VERSION})
@@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers)
 set(ad_rss_TARGET_INCLUDE_DIRECTORIES)
 set(ad_rss_TARGET_LINK_LIBRARIES)
 
-find_package(Boost REQUIRED)
+find_package(Boost CONFIG REQUIRED)
 list(APPEND ad_rss_TARGET_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
 list(APPEND ad_rss_TARGET_LINK_LIBRARIES ${Boost_LIBRARIES})
 

diff --git a/ad_rss/cmake/Config.cmake.in b/ad_rss/cmake/Config.cmake.in
@@ -17,7 +17,7 @@
 
 include(CMakeFindDependencyMacro)
 
-find_package(Boost REQUIRED)
+find_package(Boost CONFIG REQUIRED)
 list(APPEND INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
 list(APPEND LIBRARIES ${Boost_LIBRARIES})
 

diff --git a/ad_rss/python/CMakeLists.txt b/ad_rss/python/CMakeLists.txt
@@ -16,7 +16,7 @@ get_target_property(AD_PHYSICS_INCLUDES ad_physics INTERFACE_INCLUDE_DIRECTORIES
 find_package(spdlog REQUIRED CONFIG)
 get_target_property(SPDLOG_INCLUDES spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES)
 
-find_package(Boost REQUIRED)
+find_package(Boost CONFIG REQUIRED)
 
 list(APPEND INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${AD_PHYSICS_INCLUDES} ${SPDLOG_INCLUDES})
 

diff --git a/ad_rss_map_integration/CMakeLists.txt b/ad_rss_map_integration/CMakeLists.txt
@@ -6,7 +6,7 @@
 #
 # ----------------- END LICENSE BLOCK -----------------------------------
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 
 include(../cmake/ad-rss-lib-version.cmake)
 project(ad_rss_map_integration VERSION ${AD-RSS-LIB_VERSION})

diff --git a/cmake/python-binding.cmake b/cmake/python-binding.cmake
@@ -43,13 +43,13 @@ function(find_python_binding_packages)
     find_package(PythonLibs EXACT "${PYTHON_BINDING_VERSION}" REQUIRED)
   endif()
 
-  find_package(Boost REQUIRED)
+  find_package(Boost CONFIG REQUIRED)
   if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_GREATER 1.66)
     set(BOOST_PYTHON_COMPONENT python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
   else()
     set(BOOST_PYTHON_COMPONENT python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
   endif()
-  find_package(Boost COMPONENTS REQUIRED ${BOOST_PYTHON_COMPONENT})
+  find_package(Boost CONFIG COMPONENTS REQUIRED ${BOOST_PYTHON_COMPONENT})
 
   set(PYTHON_BINDING_NAME
     "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}"

diff --git a/dependencies/map b/dependencies/map
+4 −1		.github/workflows/codeql.yml
+1 −1		.github/workflows/dependency-review.yml
+3 −3		.github/workflows/install_dependencies.sh
+1 −1		.github/workflows/scorecards.yml
+1 −1		.github/workflows/wheels.yml
+2 −2		ad_map_access/CMakeLists.txt
+1 −1		ad_map_access/cmake/Config.cmake.in
+1 −1		ad_map_access_test_support/CMakeLists.txt
+2 −2		ad_map_opendrive_reader/CMakeLists.txt
+1 −1		ad_physics/CMakeLists.txt
+2 −2		cmake/python-binding.cmake
+1 −1		tools/ad_map_access_qgis/CMakeLists.txt
+1 −1		tools/map_maker/CMakeLists.txt
+1 −1		tools/map_maker/common/CMakeLists.txt
+1 −1		tools/map_maker/libosmium-cmake.txt.in