From 8871c9054b4769483295be1110900681bec1a6ca Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Sun, 29 Sep 2024 11:49:08 +0200 Subject: [PATCH] Migrate to Conan 2.x --- .github/workflows/osrm-backend.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/osrm-backend.yml b/.github/workflows/osrm-backend.yml index 899ae1a79..fba0112d3 100644 --- a/.github/workflows/osrm-backend.yml +++ b/.github/workflows/osrm-backend.yml @@ -51,21 +51,20 @@ jobs: cd build python3 -m venv .venv - ls -R .venv - + source .venv/Scripts/Activate python3 -m pip install conan==2.7.1 - # conan profile detect --force - # cat ~/.conan2/profiles/default + conan profile detect --force + cat ~/.conan2/profiles/default - # if [[ "${ENABLE_CONAN}" == "ON" ]]; then - # conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 - # fi + if [[ "${ENABLE_CONAN}" == "ON" ]]; then + conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 + fi - # cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. - # cmake --build . --config Release + cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. + cmake --build . --config Release # # TODO: MSVC goes out of memory when building our tests # # - name: Run tests