Add Conan lockfile

AMWA-TV · Sep 10, 2024 · e012e93 · e012e93
1 parent d0f019b
commit e012e93
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 4 deletions.
diff --git a/conan.lock b/conan.lock
@@ -0,0 +1,55 @@
+{
+    "version": "0.5",
+    "requires": [
+        "zlib/1.3.1#f52e03ae3d251dec704634230cd806a2%1712584843.618",
+        "websocketpp/0.8.2#842a0419153a8aa52f3ea3a1da557d38%1707932885.461",
+        "pcre2/10.42#576680686b88a4dadf6d382d6d6351d9%1719488697.677",
+        "openssl/3.2.2#899583c694f9deccec74dbe0bbc65a15%1719488694.279",
+        "nmos-cpp/cci.20240223#20612f8f03e7230f18454e2c07308c82%1719484343.002",
+        "nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1707932860.535",
+        "libselinux/3.5#5c6cc0cf385b385a83b471491977b0f4%1719488677.361",
+        "libmount/2.39#8a95198b2547a8ca7685eb7a1d002903%1719488677.075",
+        "libffi/3.4.4#72cccac6139293b6e97ec9cd676547ff%1719488676.84",
+        "libevent/2.1.12#b6333a128075d75a3614bd8418bf2099%1707932855.988",
+        "libelf/0.8.13#4f70a3555809ae50cc8add44f0f84288%1707932855.253",
+        "libdaemon/0.14#0eb527aaa9c1c48668779756cf47be6c%1707932854.7",
+        "libbacktrace/cci.20210118#ec1aa63bbc10145c6a299e68e711670c%1707932854.098",
+        "jwt-cpp/0.7.0#c4df431e5f51bce435c3e696dcac15f8%1719484342.837",
+        "json-schema-validator/2.3.0#120480a628b33709becff2515d7ae6f4%1707932852.774",
+        "gtest/1.14.0#25e2a474b4d1aecf5ff4f0555dcdf72c%1719488675.511",
+        "glib/2.78.3#0cd1865c8603d90b3bc5858065e16d01%1719488670.329",
+        "gdbm/1.23#e33e95cba20c006ae47466e2770cd984%1707932843.736",
+        "fmt/9.1.0#551bb6d903fc22780392707fed0efb18%1707932843.012",
+        "expat/2.6.3#39b80d3109fbe578fddfe4951f0b1d57%1725469045.298",
+        "dbus/1.15.8#d4d2f08b93172aaf27742ad6eee8a15d%1719488669.42",
+        "cpprestsdk/2.10.19#fc44e90f5159be5817ef170cc46961b3%1719488666.974",
+        "bzip2/1.0.8#457c272f7da34cb9c67456dd217d36c4%1707932825.828",
+        "boost/1.83.0#26a5100d8e5011c6771a0e03d404397c%1719488655.724",
+        "avahi/0.8#97e7c851597d8d8346bd775ef7d20df4%1719488654.811"
+    ],
+    "build_requires": [
+        "zlib/1.3.1#f52e03ae3d251dec704634230cd806a2%1712584843.618",
+        "pkgconf/2.2.0#6462942a22803086372db44689ba825f%1719488698.376",
+        "pkgconf/2.1.0#27f44583701117b571307cf5b5fe5605%1719488698.171",
+        "pkgconf/2.0.3#f996677e96e61e6552d85e83756c328b%1707932885.286",
+        "pcre2/10.42#576680686b88a4dadf6d382d6d6351d9%1719488697.677",
+        "ninja/1.11.1#77587f8c8318662ac8e5a7867eb4be21%1707932860.14",
+        "meson/1.4.0#024dfac41ea5570cb1aec3ea6fe34d0a%1719488677.838",
+        "meson/1.2.2#04bdfb85d665c82b08a3510aee3ffd19%1719488677.639",
+        "m4/1.4.19#b38ced39a01e31fef5435bc634461fd2%1707932859.309",
+        "libselinux/3.5#5c6cc0cf385b385a83b471491977b0f4%1719488677.361",
+        "libmount/2.39#8a95198b2547a8ca7685eb7a1d002903%1719488677.075",
+        "libffi/3.4.4#72cccac6139293b6e97ec9cd676547ff%1719488676.84",
+        "libelf/0.8.13#4f70a3555809ae50cc8add44f0f84288%1707932855.253",
+        "gnu-config/cci.20210814#dc430d754f465e8c74463019672fb97b%1707932851.307",
+        "glib/2.78.3#0cd1865c8603d90b3bc5858065e16d01%1719488670.329",
+        "flex/2.6.4#e35bc44b3fcbcd661e0af0dc5b5b1ad4%1707932842.498",
+        "cmake/3.29.6#1a639e3e7401ea46e16c83ec9c5a7922%1719488663.177",
+        "bzip2/1.0.8#457c272f7da34cb9c67456dd217d36c4%1707932825.828",
+        "bison/3.8.2#ed1ba0c42d2ab7ab64fc3a62e9ecc673%1707932813.569",
+        "b2/5.2.1#91bc73931a0acb655947a81569ed8b80%1719488655.382",
+        "autoconf/2.71#f9307992909d7fb3df459340f1932809%1719488654.586"
+    ],
+    "python_requires": [],
+    "config_requires": []
+}
diff --git a/cpp/libs/ossrf_nmos_api/lib/src/context/resource_map.cpp b/cpp/libs/ossrf_nmos_api/lib/src/context/resource_map.cpp
@@ -103,4 +103,4 @@ std::vector<std::string> resource_map_t::get_receiver_ids() const
     }
 
     return ids;
-}
+}
diff --git a/cpp/libs/ossrf_nmos_api/lib/src/context/resource_map.h b/cpp/libs/ossrf_nmos_api/lib/src/context/resource_map.h
@@ -36,7 +36,6 @@ namespace ossrf
         bisect::expected<nmos_resource_ptr> find_resource(const std::string& resource_id);
         std::vector<std::string> get_sender_ids() const;
         std::vector<std::string> get_receiver_ids() const;
-
     };
 
     using resource_map_ptr  = std::shared_ptr<resource_map_t>;

diff --git a/images/dev/Dockerfile b/images/dev/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 
 # Versions
-ENV CONAN_VERSION=2.2.0
+ENV CONAN_VERSION=2.4.0
 ENV CMAKE_VERSION=3.27.0
 ENV SSHD_PORT=55555
 

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -22,7 +22,7 @@ CONAN_MIN_VERSION="2.0.0"
 function setup() {
     pushd ${PROJECT_DIR}
     for configuration in $CONFIGURATIONS; do
-        conan install . --output-folder ${PROJECT_DIR} --build=missing --settings=build_type="$configuration" --settings=compiler.cppstd=17
+        conan install . --output-folder ${PROJECT_DIR} --build=missing --settings=build_type="$configuration" --settings=compiler.cppstd=17 --lockfile=conan.lock
     done
     popd
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         return ids;
-    }
+    }