From 2293d13c4c9e82d9dd0fa72c4ca45e9d2ff5a89d Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Mon, 30 Sep 2024 20:55:34 +0300 Subject: [PATCH] Migrate to Conan 2.x --- .github/workflows/osrm-backend.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 209cee20c..1ae821831 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -63,7 +63,7 @@ jobs: ls -la cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. - # cmake --build . --config Release + cmake --build . --config Release # # TODO: MSVC goes out of memory when building our tests # # - name: Run tests @@ -537,7 +537,7 @@ jobs: # sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default if [[ "${ENABLE_CONAN}" == "ON" ]]; then - conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 #--settings build_type=Release + conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 --settings build_type=${BUILD_TYPE} fi ccache --zero-stats