Merge branch 'master' into fix/invalid_contract_node

Author: fenwuyaoji

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,7 +12,7 @@ If your PR is still work in progress please attach the relevant label.
  - [ ] add tests (see [testing documentation](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/testing.md))
  - [ ] review
  - [ ] adjust for comments
- - [ ] cherry pick to release branch
+
 
 ## Requirements / Relations
 

.github/workflows/osrm-backend.yml

@@ -25,7 +25,7 @@ concurrency:
 jobs:
   conan-windows-release-node:
     needs: format-taginfo-docs
-    runs-on: windows-2022
+    runs-on: windows-2025
     continue-on-error: false
     env:
       BUILD_TYPE: Release
@@ -172,9 +172,8 @@ jobs:
         include:
           - name: gcc-13-debug-cov
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Debug
             CCOMPILER: gcc-13
             CUCUMBER_TIMEOUT: 20000
@@ -183,9 +182,8 @@ jobs:
 
           - name: clang-18-debug-asan-ubsan
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Debug
             CCOMPILER: clang-18
             CUCUMBER_TIMEOUT: 20000
@@ -197,9 +195,8 @@ jobs:
 
           - name: clang-18-release
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang-18
             CXXCOMPILER: clang++-18
@@ -208,9 +205,8 @@ jobs:
 
           - name: clang-18-debug
             continue-on-error: false
-            node: 18
+            node:
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Debug
             CCOMPILER: clang-18
             CXXCOMPILER: clang++-18
@@ -221,19 +217,18 @@ jobs:
             continue-on-error: false
             node: 18
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Debug
             CCOMPILER: clang-18
             CXXCOMPILER: clang++-18
             CUCUMBER_TIMEOUT: 60000
             ENABLE_CLANG_TIDY: ON
-
+            NODE_PACKAGE_TESTS_ONLY: ON
+            ENABLE_LTO: OFF
 
           - name: clang-17-release
             continue-on-error: false
             node: 18
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang-17
             CXXCOMPILER: clang++-17
@@ -244,7 +239,6 @@ jobs:
             continue-on-error: false
             node: 18
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang-16
             CXXCOMPILER: clang++-16
@@ -255,7 +249,6 @@ jobs:
             continue-on-error: false
             node: 18
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang-18
             CXXCOMPILER: clang++-18
@@ -267,7 +260,6 @@ jobs:
             continue-on-error: false
             node: 18
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang-18
             CXXCOMPILER: clang++-18
@@ -276,29 +268,26 @@ jobs:
 
           - name: gcc-14-release
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: gcc-14
             CXXCOMPILER: g++-14
             CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
 
           - name: gcc-13-release
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: gcc-13
             CXXCOMPILER: g++-13
             CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
 
           - name: gcc-12-release
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-22.04
-            BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: gcc-12
             CXXCOMPILER: g++-12
@@ -307,7 +296,7 @@ jobs:
           - name: conan-linux-release-node
             build_node_package: true
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
             BUILD_TYPE: Release
             CCOMPILER: clang-16
@@ -318,7 +307,7 @@ jobs:
           - name: conan-linux-debug-node
             build_node_package: true
             continue-on-error: false
-            node: 20
+            node: 22
             runs-on: ubuntu-24.04
             BUILD_TYPE: Debug
             CCOMPILER: clang-16
@@ -329,7 +318,7 @@ jobs:
           - name: conan-macos-x64-release-node
             build_node_package: true
             continue-on-error: true
-            node: 20
+            node: 22
             runs-on: macos-13 # x86_64
             BUILD_TYPE: Release
             CCOMPILER: clang
@@ -341,7 +330,7 @@ jobs:
           - name: conan-macos-arm64-release-node
             build_node_package: true
             continue-on-error: true
-            node: 20
+            node: 22
             runs-on: macos-15 # arm64 
             BUILD_TYPE: Release
             CCOMPILER: clang
@@ -354,7 +343,6 @@ jobs:
     continue-on-error: ${{ matrix.continue-on-error }}
     runs-on: ${{ matrix.runs-on }}
     env:
-      BUILD_TOOLS: ${{ matrix.BUILD_TOOLS }}
       BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
       CCOMPILER: ${{ matrix.CCOMPILER }}
@@ -518,7 +506,6 @@ jobs:
                  -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \
                  -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
                  -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \
-                 -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \
                  -DENABLE_CCACHE=ON \
                  -DENABLE_LTO=${ENABLE_LTO:-ON} \
                  -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
@@ -538,24 +525,13 @@ jobs:
         popd
       env:
         Boost_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
-    - name: Build example
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' && matrix.ENABLE_CONAN != 'ON' }}
-      run: |
-        mkdir example/build && pushd example/build
-        cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-                 -DBoost_ROOT=${{ steps.install-boost.outputs.BOOST_ROOT }}
-        make --jobs=${JOBS}
-        popd
     - name: Run all tests
       if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
       run: |
         make -C test/data benchmark
 
         # macOS SIP strips the linker path. Reset this inside the running shell
-        if [[ "${ENABLE_CONAN}" == "OFF" ]]; then
-          export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
-          ./example/build/osrm-example test/data/mld/monaco.osrm
-        fi
+        export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
 
         # All tests assume to be run from the build directory
         pushd ${OSRM_BUILD_DIR}
@@ -576,12 +552,12 @@ jobs:
       run: |
         node --version
         npm run nodejs-tests
-    - name: Use Node 20
+    - name: Use Node 22
       if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
       uses: actions/setup-node@v4
       with:
-        node-version: 20
-    - name: Run Node package tests on Node 20
+        node-version: 22
+    - name: Run Node package tests on Node 22
       if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
       run: |
         node --version
@@ -604,22 +580,6 @@ jobs:
         name: logs
         path: test/logs/
 
-    # - name: Generate code coverage
-    #   if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
-    #   run: |
-    #     lcov --directory . --capture --output-file coverage.info # capture coverage info
-    #     lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
-    #     lcov --list coverage.info #debug info
-    
-    # # Uploading report to CodeCov
-    # - name: Upload code coverage
-    #   if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
-    #   uses: codecov/codecov-action@v4
-    #   with:
-    #     files: coverage.info
-    #     name: codecov-osrm-backend
-    #     fail_ci_if_error: true
-    #     verbose: true
     - name: Build Node package
       if: ${{ matrix.build_node_package }}
       run: ./scripts/ci/node_package.sh
@@ -646,4 +606,3 @@ jobs:
     needs: [build-matrix, conan-windows-release-node, docker-image-matrix]
     steps:
     - run: echo "CI complete"
-

.gitignore

@@ -43,7 +43,6 @@ Thumbs.db
 #######################
 /_build*
 /build/
-/example/build/
 /test/data/monaco.osrm*
 /test/data/ch
 /test/data/mld

CHANGELOG.md

@@ -82,6 +82,7 @@
       - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
       - FIXED: Segfault in `UnresolvedManeuverOverride::Turns()` on Australia extracts [#7112](https://github.com/Project-OSRM/osrm-backend/pull/7112)
       - CHANGED: Replaced PL:trunk with PL:expressway to match the latest changes in Polish tagging [#7079](https://github.com/Project-OSRM/osrm-backend/pull/7079)
+      - FIXED: Remove unused C++ headers [#7105](https://github.com/Project-OSRM/osrm-backend/pull/7105)
     - Profiles:
       - FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
       - ADDED: Add optional support of cargo bike exclusion and width to bicyle profile [#7044](https://github.com/Project-OSRM/osrm-backend/pull/7044)