Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin revisions of Conan dependencies #6351

Merged
merged 4 commits into from
Aug 31, 2022
Merged

Pin revisions of Conan dependencies #6351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83ee5b7
Pin revisions of Conan dependencies
SiarheiFedartsou Aug 30, 2022
27f1ffe
Pin revisions of Conan dependencies
SiarheiFedartsou Aug 30, 2022
103ecbb
Pin revisions of Conan dependencies
SiarheiFedartsou Aug 30, 2022
b66352a
wip
SiarheiFedartsou Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/osrm-backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,9 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.conan
key: v3-conan-${{ matrix.name }}-${{ github.sha }}
key: v4-conan-${{ matrix.name }}-${{ github.sha }}
restore-keys: |
v3-conan-${{ matrix.name }}-
v4-conan-${{ matrix.name }}-
- name: Enable test cache
uses: actions/cache@v2
with:
Expand Down Expand Up @@ -516,7 +516,7 @@ jobs:

- name: Install dev dependencies
run: |
python3 -m pip install conan==1.50.0
python3 -m pip install conan==1.51.3

# CMake
mkdir -p ${CMAKE_DIR}
Expand Down
22 changes: 11 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,11 @@ if(ENABLE_CONAN)

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

set(CONAN_BOOST_VERSION 1.79.0)
set(CONAN_BZIP2_VERSION 1.0.8)
set(CONAN_EXPAT_VERSION 2.2.10)
set(CONAN_LUA_VERSION 5.4.4)
set(CONAN_TBB_VERSION 2021.3.0)
set(CONAN_BOOST_VERSION "1.79.0#96e4902111a2e343a8ba0aa95391bb58")
set(CONAN_BZIP2_VERSION "1.0.8#d1b2d5816f25865acf978501dff1f897")
set(CONAN_EXPAT_VERSION "2.2.10#916908d4a570ad839edd25322c3268cd")
set(CONAN_LUA_VERSION "5.4.4#3ec62efc37cd0a5d80b9e5cb35277360")
set(CONAN_TBB_VERSION "2021.3.0#507ec17cbd51a84167e143b20d170eea")

set(CONAN_SYSTEM_INCLUDES ON)

Expand All @@ -478,11 +478,11 @@ if(ENABLE_CONAN)

set(CONAN_ARGS
REQUIRES
boost/${CONAN_BOOST_VERSION}
bzip2/${CONAN_BZIP2_VERSION}
expat/${CONAN_EXPAT_VERSION}
lua/${CONAN_LUA_VERSION}
onetbb/${CONAN_TBB_VERSION}
"boost/${CONAN_BOOST_VERSION}"
"bzip2/${CONAN_BZIP2_VERSION}"
"expat/${CONAN_EXPAT_VERSION}"
"lua/${CONAN_LUA_VERSION}"
"onetbb/${CONAN_TBB_VERSION}"
BASIC_SETUP
GENERATORS cmake_find_package
KEEP_RPATHS
Expand All @@ -505,7 +505,7 @@ if(ENABLE_CONAN)
add_dependency_includes(${CONAN_INCLUDE_DIRS_TBB})

set(Boost_USE_STATIC_LIBS ON)
find_package(Boost REQUIRED EXACT ${CONAN_BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS})
find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
set(Boost_DATE_TIME_LIBRARY "${Boost_date_time_LIB_TARGETS}")
set(Boost_CHRONO_LIBRARY "${Boost_chrono_LIB_TARGETS}")
set(Boost_PROGRAM_OPTIONS_LIBRARY "${Boost_program_options_LIB_TARGETS}")
Expand Down