From a65622b3f26159f0f992ea4174faa8f2974a50eb Mon Sep 17 00:00:00 2001 From: John OConnor Date: Tue, 3 Jan 2023 15:49:50 -0800 Subject: [PATCH] update conan to 1.56.0 --- sdk/cpp/Dockerfile | 2 +- sdk/cpp/makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cpp/Dockerfile b/sdk/cpp/Dockerfile index c732243..b1d4d67 100644 --- a/sdk/cpp/Dockerfile +++ b/sdk/cpp/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get -y install ninja-build RUN apt-get -y install cmake RUN apt-get -y install python3-dev RUN apt-get -y install python3-pip -RUN pip3 install conan==1.43.0 # Match the version defined in Makefile deps: +RUN pip3 install conan==1.56.0 # Match the version defined in Makefile deps: COPY . /opt WORKDIR /opt diff --git a/sdk/cpp/makefile b/sdk/cpp/makefile index 01fe824..17b83ac 100644 --- a/sdk/cpp/makefile +++ b/sdk/cpp/makefile @@ -15,9 +15,9 @@ install: brew # installs all deps required for building the project deps: ifeq ($(shell uname),Darwin) - sudo port install ninja + sudo brew install ninja endif - python3 -m pip install conan==1.43.0 + python3 -m pip install conan==1.56.0 # Match the version defined in Dockerfile type conan && echo "done" || echo "\n\n\tcould not find 'conan'. Ensure python's bin/ directory is in your path\n\n" type conan conan remote clean