From 6527ab2a6c4e9e73cc151ebfcd26ef2ee2dc4ba3 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:49:10 -0300 Subject: [PATCH] chore: update conan version --- .github/actions/build-cpp/Dockerfile | 2 +- .github/workflows/build_cross.yml | 2 +- .github/workflows/code-ql.yml | 2 +- docker/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build-cpp/Dockerfile b/.github/actions/build-cpp/Dockerfile index 9ae312f13..22ddda48c 100644 --- a/.github/actions/build-cpp/Dockerfile +++ b/.github/actions/build-cpp/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /pktvisor-src RUN apt-get update && \ apt-get upgrade --yes --force-yes && \ apt-get install --yes --force-yes --no-install-recommends ${BUILD_DEPS} && \ - pip3 install 'conan==1.61.0' --force-reinstall + pip3 install 'conan==1.64.1' --force-reinstall RUN chmod +x /entrypoint.sh diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index c27514eb9..254600b58 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -69,7 +69,7 @@ jobs: curl -L "${{matrix.toolchain}}" | tar -C toolchain -xz --strip-components=1 - name: Install Conan - run: pip install --no-cache-dir 'conan==1.61.0' --force-reinstall + run: pip install --no-cache-dir 'conan==1.64.1' --force-reinstall - name: Create Conan configuration run: | diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml index 42a34cadb..b11afc20e 100644 --- a/.github/workflows/code-ql.yml +++ b/.github/workflows/code-ql.yml @@ -60,7 +60,7 @@ jobs: - run: | # Run Build - set up dependencies, env vars, compile, and make test #install conan - pip install --no-cache-dir 'conan==1.61.0' --force-reinstall + pip install --no-cache-dir 'conan==1.64.1' --force-reinstall # create conan config CONAN_V2_MODE=1 conan config init conan config set general.revisions_enabled=1 diff --git a/docker/Dockerfile b/docker/Dockerfile index fa53ffbd5..898700706 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,7 +6,7 @@ RUN \ apt-get update && \ apt-get upgrade --yes --force-yes && \ apt-get install --yes --force-yes --no-install-recommends ${BUILD_DEPS} && \ - pip3 install "conan==1.61.0" + pip3 install "conan==1.64.1" # need git for current hash for VERSION COPY ./.git/ /pktvisor-src/.git/