Skip to content

Commit c003ac1

Browse files
Pin revisions of Conan dependencies (#6351)
1 parent 9a638f3 commit c003ac1

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/osrm-backend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,9 @@ jobs:
475475
uses: actions/cache@v2
476476
with:
477477
path: ~/.conan
478-
key: v3-conan-${{ matrix.name }}-${{ github.sha }}
478+
key: v4-conan-${{ matrix.name }}-${{ github.sha }}
479479
restore-keys: |
480-
v3-conan-${{ matrix.name }}-
480+
v4-conan-${{ matrix.name }}-
481481
- name: Enable test cache
482482
uses: actions/cache@v2
483483
with:
@@ -516,7 +516,7 @@ jobs:
516516
517517
- name: Install dev dependencies
518518
run: |
519-
python3 -m pip install conan==1.50.0
519+
python3 -m pip install conan==1.51.3
520520
521521
# CMake
522522
mkdir -p ${CMAKE_DIR}

CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -459,11 +459,11 @@ if(ENABLE_CONAN)
459459

460460
include(${CMAKE_CURRENT_LIST_DIR}/cmake/conan.cmake)
461461

462-
set(CONAN_BOOST_VERSION 1.79.0)
463-
set(CONAN_BZIP2_VERSION 1.0.8)
464-
set(CONAN_EXPAT_VERSION 2.2.10)
465-
set(CONAN_LUA_VERSION 5.4.4)
466-
set(CONAN_TBB_VERSION 2021.3.0)
462+
set(CONAN_BOOST_VERSION "1.79.0#96e4902111a2e343a8ba0aa95391bb58")
463+
set(CONAN_BZIP2_VERSION "1.0.8#d1b2d5816f25865acf978501dff1f897")
464+
set(CONAN_EXPAT_VERSION "2.2.10#916908d4a570ad839edd25322c3268cd")
465+
set(CONAN_LUA_VERSION "5.4.4#3ec62efc37cd0a5d80b9e5cb35277360")
466+
set(CONAN_TBB_VERSION "2021.3.0#507ec17cbd51a84167e143b20d170eea")
467467

468468
set(CONAN_SYSTEM_INCLUDES ON)
469469

@@ -478,11 +478,11 @@ if(ENABLE_CONAN)
478478

479479
set(CONAN_ARGS
480480
REQUIRES
481-
boost/${CONAN_BOOST_VERSION}
482-
bzip2/${CONAN_BZIP2_VERSION}
483-
expat/${CONAN_EXPAT_VERSION}
484-
lua/${CONAN_LUA_VERSION}
485-
onetbb/${CONAN_TBB_VERSION}
481+
"boost/${CONAN_BOOST_VERSION}"
482+
"bzip2/${CONAN_BZIP2_VERSION}"
483+
"expat/${CONAN_EXPAT_VERSION}"
484+
"lua/${CONAN_LUA_VERSION}"
485+
"onetbb/${CONAN_TBB_VERSION}"
486486
BASIC_SETUP
487487
GENERATORS cmake_find_package
488488
KEEP_RPATHS
@@ -505,7 +505,7 @@ if(ENABLE_CONAN)
505505
add_dependency_includes(${CONAN_INCLUDE_DIRS_TBB})
506506

507507
set(Boost_USE_STATIC_LIBS ON)
508-
find_package(Boost REQUIRED EXACT ${CONAN_BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS})
508+
find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
509509
set(Boost_DATE_TIME_LIBRARY "${Boost_date_time_LIB_TARGETS}")
510510
set(Boost_CHRONO_LIBRARY "${Boost_chrono_LIB_TARGETS}")
511511
set(Boost_PROGRAM_OPTIONS_LIBRARY "${Boost_program_options_LIB_TARGETS}")

0 commit comments

Comments
 (0)