Migrate to Conan 2.x

This commit is contained in:
Siarhei Fedartsou 2024-09-29 11:31:36 +02:00
parent 324e4eecc6
commit 893c0d7d1d

View File

@ -51,19 +51,20 @@ jobs:
cd build cd build
python3 -m venv .venv python3 -m venv .venv
source .venv/bin/activate ls -R .venv
# source .venv/bin/activate
python3 -m pip install conan==2.7.1 # python3 -m pip install conan==2.7.1
conan profile detect --force # conan profile detect --force
cat ~/.conan2/profiles/default # cat ~/.conan2/profiles/default
if [[ "${ENABLE_CONAN}" == "ON" ]]; then # if [[ "${ENABLE_CONAN}" == "ON" ]]; then
conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 # conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
fi # fi
cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake .. # 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 # # TODO: MSVC goes out of memory when building our tests
# # - name: Run tests # # - name: Run tests
@ -404,10 +405,10 @@ jobs:
- name: Enable Conan cache - name: Enable Conan cache
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
path: ~/.conan path: ~/.conan2
key: v9-conan-${{ matrix.name }}-${{ github.sha }} key: v10-conan-${{ matrix.name }}-${{ github.sha }}
restore-keys: | restore-keys: |
v9-conan-${{ matrix.name }}- v10-conan-${{ matrix.name }}-
- name: Enable test cache - name: Enable test cache
uses: actions/cache@v4 uses: actions/cache@v4
with: with:
@ -535,46 +536,45 @@ jobs:
python3 -m venv .venv python3 -m venv .venv
ls -R .venv source .venv/bin/activate
# source .venv/bin/activate
# python3 -m pip install conan==2.7.1 python3 -m pip install conan==2.7.1
# conan profile detect --force conan profile detect --force
# cat ~/.conan2/profiles/default cat ~/.conan2/profiles/default
# # sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default # sed -i '' 's/compiler.cppstd=.*$/compiler.cppstd=20/' ~/.conan/profiles/default
# if [[ "${ENABLE_CONAN}" == "ON" ]]; then if [[ "${ENABLE_CONAN}" == "ON" ]]; then
# conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20 conan install .. --output-folder=. --build=missing --settings compiler.cppstd=20
# fi fi
# ccache --zero-stats ccache --zero-stats
# cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
# -DENABLE_CONAN=${ENABLE_CONAN:-OFF} \ -DENABLE_CONAN=${ENABLE_CONAN:-OFF} \
# -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} \ -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} \
# -DENABLE_CLANG_TIDY=${ENABLE_CLANG_TIDY:-OFF} \ -DENABLE_CLANG_TIDY=${ENABLE_CLANG_TIDY:-OFF} \
# -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} \ -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} \
# -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \ -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \
# -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \ -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
# -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \ -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \
# -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \ -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \
# -DENABLE_CCACHE=ON \ -DENABLE_CCACHE=ON \
# -DENABLE_LTO=${ENABLE_LTO:-ON} \ -DENABLE_LTO=${ENABLE_LTO:-ON} \
# -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \ -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
# -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake
# make --jobs=${JOBS} make --jobs=${JOBS}
# if [[ "${NODE_PACKAGE_TESTS_ONLY}" != "ON" ]]; then if [[ "${NODE_PACKAGE_TESTS_ONLY}" != "ON" ]]; then
# make tests --jobs=${JOBS} make tests --jobs=${JOBS}
# make benchmarks --jobs=${JOBS} make benchmarks --jobs=${JOBS}
# sudo make install sudo make install
# if [[ "${RUNNER_OS}" == "Linux" ]]; then if [[ "${RUNNER_OS}" == "Linux" ]]; then
# echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OSRM_INSTALL_DIR}/lib" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OSRM_INSTALL_DIR}/lib" >> $GITHUB_ENV
# fi fi
# echo "PKG_CONFIG_PATH=${OSRM_INSTALL_DIR}/lib/pkgconfig" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=${OSRM_INSTALL_DIR}/lib/pkgconfig" >> $GITHUB_ENV
# fi fi
# popd popd
- name: Build example - name: Build example
if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }} if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
run: | run: |