🔨 bump conan to v1.32.0 and back-end dependencies (#29)

prince-chrismc · Dec 5, 2020 · f6712ed · f6712ed
1 parent e501080
commit f6712ed
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
@@ -40,8 +40,10 @@ jobs:
         cd backend
         conan remote add $CONAN_REMOTE $CONAN_REMOTE_URL
         conan user -p ${{ secrets.JFROG_RTFACT_PASSWORD }} -r $CONAN_REMOTE prince-chrismc
-        conan create . $BUILD_VERSION@
-        conan create . $BUILD_VERSION@ -s build_type=Debug
+        conan lock create conanfile.py --version $BUILD_VERSION --lockfile=conan.lock --lockfile-out=locks/release.lock -s build_type=Release -s compiler.libcxx=libstdc++11
+        conan create conanfile.py $BUILD_VERSION@ --lockfile=locks/release.lock
+        conan lock create conanfile.py --version $BUILD_VERSION --lockfile=conan.lock --lockfile-out=locks/debug.lock -s build_type=Debug -s compiler.libcxx=libstdc++11
+        conan create conanfile.py $BUILD_VERSION@ --lockfile=locks/debug.lock
         conan upload $NAME/$BUILD_VERSION@ -r $CONAN_REMOTE --all
 
   frontend:

diff --git a/backend/cmake/conan-setup.cmake b/backend/cmake/conan-setup.cmake
@@ -10,16 +10,26 @@ else()
   endif()
 
   include(${CONAN_WRAPPER})
-  conan_check(VERSION 1.28.0 REQUIRED)
+  conan_check(VERSION 1.32.0 REQUIRED)
 
   # Create the complete lockfile
   execute_process(
     COMMAND
-      conan lock create ${CMAKE_CURRENT_SOURCE_DIR}/conanfile.py -u -l ${CMAKE_CURRENT_SOURCE_DIR}/conan.lock
+      conan lock create ${CMAKE_CURRENT_SOURCE_DIR}/conanfile.py -l ${CMAKE_CURRENT_SOURCE_DIR}/conan.lock
       --lockfile-out=${CMAKE_CURRENT_BINARY_DIR}/conan.lock -s build_type=${CMAKE_BUILD_TYPE} -s
-      compiler.libcxx=libstdc++11)
+      compiler.libcxx=libstdc++11
+    RESULT_VARIABLE STATUS)
+
+  if(STATUS AND NOT STATUS EQUAL 0)
+    message(FATAL_ERROR "Conan Setup: failed to generate full lockfile!")
+  endif()
 
   # Populate the 'build' folder with the correct file to locate dependencies
-  execute_process(COMMAND conan install ${CMAKE_CURRENT_SOURCE_DIR}/conanfile.py -l
-                          ${CMAKE_CURRENT_BINARY_DIR}/conan.lock WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  execute_process(
+    COMMAND conan install ${CMAKE_CURRENT_SOURCE_DIR}/conanfile.py -l ${CMAKE_CURRENT_BINARY_DIR}/conan.lock
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} RESULT_VARIABLE STATUS)
+
+  if(STATUS AND NOT STATUS EQUAL 0)
+    message(FATAL_ERROR "Conan Setup: failed to install requirements!")
+  endif()
 endif()
diff --git a/backend/conan.lock b/backend/conan.lock
@@ -15,7 +15,7 @@
     "context": "host"
    },
    "1": {
-    "ref": "restinio/0.6.12#5e99922ca31945e41e2c3d4cb8998720",
+    "ref": "restinio/0.6.12#f9314f8afdfe86de98f6fac66020c517",
     "requires": [
      "2",
      "3",
@@ -37,19 +37,19 @@
     "context": "host"
    },
    "4": {
-    "ref": "expected-lite/0.4.0#38a249dc6180ebad129c295fb474f3b6",
+    "ref": "expected-lite/0.5.0#be98443653439dd87e4c4afb57846f1b",
     "context": "host"
    },
    "5": {
-    "ref": "optional-lite/3.2.0#c155747d4127565689129d8b1a398ed3",
+    "ref": "optional-lite/3.4.0#70a4a81fbb3b86d22c797360857f5955",
     "context": "host"
    },
    "6": {
     "ref": "string-view-lite/1.6.0#326afcf276c7c791558045027b294501",
     "context": "host"
    },
    "7": {
-    "ref": "variant-lite/1.2.2#acd4057555f961ae23c72e2498ce3913",
+    "ref": "variant-lite/1.2.2#e2a9ee39933cb18d2326dab6cfe97375",
     "context": "host"
    },
    "8": {

diff --git a/backend/src/database/CMakeLists.txt b/backend/src/database/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(fmt 7.0 REQUIRED)
+find_package(fmt 7.1.2 REQUIRED)
 
 add_subdirectory("encoders")
 

diff --git a/backend/src/utility/CMakeLists.txt b/backend/src/utility/CMakeLists.txt
@@ -1,5 +1,5 @@
 find_package(lyra 1.5.0 REQUIRED)
-find_package(fmt 7.0.3 REQUIRED)
+find_package(fmt 7.1.2 REQUIRED)
 
 add_library(app_args "app_args.hpp" "app_args.cpp")
 target_include_directories(app_args PUBLIC "..")