Skip to content

Commit

Permalink
fix reivision syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
csegarragonz committed Dec 19, 2021
1 parent 242b1e4 commit 866e28a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
29 changes: 18 additions & 11 deletions cmake/ExternalProjects.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,28 @@ endif()

include(${CMAKE_CURRENT_BINARY_DIR}/conan.cmake)

conan_check(VERSION 1.41.0 REQUIRED)
conan_check(VERSION 1.43.0 REQUIRED)

# Enable revisions in the conan config
execute_process(COMMAND ${CONAN_CMD} config set general.revisions_enabled=1
RESULT_VARIABLE return_code)
if(NOT "${return_code}" STREQUAL "0")
message(FATAL_ERROR "Error setting revisions for Conan: '${return_code}'")
endif()

conan_cmake_configure(
REQUIRES
boost/1.77.0@#d0be0b4b04a551f5d49ac540e59f51bd
catch2/2.13.7#31c8cd08e3c957a9eac8cb1377cf5863
cppcodec/0.2#f6385611ce2f7cff954ac8b16e25c4fa
cpprestsdk/2.10.18#36e30936126a3da485ce05d619fb1249
cppzmq/4.8.1#e0f26b0614b3d812815edc102ce0d881
flatbuffers/2.0.0#82f5d13594b370c3668bb8abccffc706
hiredis/1.0.2#297f55bf1e66f8b9c1dc0e7d35e705ab
protobuf/3.17.1#12f6551f4a57bbd3bf38ff3aad6aaa7e
rapidjson/cci.20200410#abe3eeacf36801901f6f6d82d124781a
spdlog/1.9.2#3724602b7b7e843c5e0a687c45e279c9
zeromq/4.3.4#3b9b0de9c4509784dc92629f3aaf2fe4
catch2/2.13.7@#31c8cd08e3c957a9eac8cb1377cf5863
cppcodec/0.2@#f6385611ce2f7cff954ac8b16e25c4fa
cpprestsdk/2.10.18@#36e30936126a3da485ce05d619fb1249
cppzmq/4.8.1@#e0f26b0614b3d812815edc102ce0d881
flatbuffers/2.0.0@#82f5d13594b370c3668bb8abccffc706
hiredis/1.0.2@#297f55bf1e66f8b9c1dc0e7d35e705ab
protobuf/3.17.1@#12f6551f4a57bbd3bf38ff3aad6aaa7e
rapidjson/cci.20200410@#abe3eeacf36801901f6f6d82d124781a
spdlog/1.9.2@#3724602b7b7e843c5e0a687c45e279c9
zeromq/4.3.4@#3b9b0de9c4509784dc92629f3aaf2fe4
GENERATORS
cmake_find_package
cmake_paths
Expand Down
2 changes: 1 addition & 1 deletion docker/faabric.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM faasm/faabric-base:0.2.2
FROM faasm/faabric-base:0.2.3
ARG FAABRIC_VERSION

# faabic-base image is not re-built often, so tag may be behind
Expand Down

0 comments on commit 866e28a

Please sign in to comment.