diff --git a/.github/actions/build-cpp/Dockerfile b/.github/actions/build-cpp/Dockerfile index 4fc2ec739..881b9c842 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==2.6.0' --force-reinstall + pip3 install conan --force-reinstall RUN chmod +x /entrypoint.sh diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 86b474157..dbcab7980 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -41,8 +41,6 @@ jobs: - name: Get Conan id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Setup OSX Environment run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV @@ -100,8 +98,6 @@ jobs: # uses: turtlebrowser/get-conan@4dc7e6dd45c8b1e02e909979d7cfc5ebba6ddbe2 id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: linux package install run: | @@ -167,8 +163,6 @@ jobs: # uses: turtlebrowser/get-conan@4dc7e6dd45c8b1e02e909979d7cfc5ebba6ddbe2 id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Setup Conan Cache uses: actions/cache@v4 @@ -392,8 +386,6 @@ jobs: - name: Get Conan id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Configure CMake to generate VERSION shell: bash diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 5d23dc6fe..ba50a7854 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -31,8 +31,6 @@ jobs: - name: Get Conan id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Setup Conan Cache uses: actions/cache@v4 @@ -83,8 +81,6 @@ jobs: - name: Get Conan id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Configure CMake to generate VERSION shell: bash @@ -133,8 +129,6 @@ jobs: - name: Get Conan id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Configure CMake to generate VERSION shell: bash @@ -279,8 +273,6 @@ jobs: # uses: turtlebrowser/get-conan@4dc7e6dd45c8b1e02e909979d7cfc5ebba6ddbe2 id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Setup Conan Cache uses: actions/cache@v4 diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index 73e143fc4..ee3dbe38f 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -68,7 +68,7 @@ jobs: curl -L "${{matrix.toolchain}}" | tar -C toolchain -xz --strip-components=1 - name: Install Conan - run: pip install --no-cache-dir 'conan==2.6.0' --force-reinstall + run: pip install --no-cache-dir conan --force-reinstall - name: Create Conan host profile run: | diff --git a/.github/workflows/build_debug.yml b/.github/workflows/build_debug.yml index 4fdde4b88..f334816c4 100644 --- a/.github/workflows/build_debug.yml +++ b/.github/workflows/build_debug.yml @@ -32,8 +32,6 @@ jobs: # uses: turtlebrowser/get-conan@4dc7e6dd45c8b1e02e909979d7cfc5ebba6ddbe2 id: conan uses: turtlebrowser/get-conan@main - with: - version: 2.6.0 - name: Setup Conan Cache uses: actions/cache@v4 diff --git a/.github/workflows/code-ql.yml b/.github/workflows/code-ql.yml index f69630837..684d63a3f 100644 --- a/.github/workflows/code-ql.yml +++ b/.github/workflows/code-ql.yml @@ -70,7 +70,7 @@ jobs: - run: | # Run Build - set up dependencies, env vars, compile, and make test #install conan - pip install --no-cache-dir 'conan==2.6.0' --force-reinstall + pip install --no-cache-dir conan --force-reinstall # create conan config CONAN_V2_MODE=1 conan config init conan config set general.revisions_enabled=1 diff --git a/cmake/conan_provider.cmake b/cmake/conan_provider.cmake index 0d2be004e..2a01f0408 100644 --- a/cmake/conan_provider.cmake +++ b/cmake/conan_provider.cmake @@ -673,4 +673,4 @@ if(NOT _cmake_program) set(PATH_TO_CMAKE_BIN "${PATH_TO_CMAKE_BIN}" CACHE INTERNAL "Path where the CMake executable is") endif() -cmake_policy(POP) +cmake_policy(POP) \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 89de29d97..ce28ac68d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -7,26 +7,26 @@ class Pktvisor(ConanFile): generators = "CMakeToolchain", "CMakeDeps" def requirements(self): - self.requires("catch2/3.6.0") + self.requires("catch2/3.7.1") self.requires("corrade/2020.06") - self.requires("cpp-httplib/0.16.0") + self.requires("cpp-httplib/0.18.2") self.requires("docopt.cpp/0.6.3") self.requires("fast-cpp-csv-parser/cci.20240102") self.requires("json-schema-validator/2.3.0") self.requires("libmaxminddb/1.10.0") self.requires("nlohmann_json/3.11.3") - self.requires("openssl/3.3.1") + self.requires("openssl/3.3.2") if self.settings.os != "Windows": self.requires("libpcap/1.10.4", force=True) - self.requires("opentelemetry-proto/1.3.0") + self.requires("opentelemetry-proto/1.4.0") self.requires("pcapplusplus/23.09") self.requires("protobuf/5.27.0") self.requires("sigslot/1.2.2") - self.requires("spdlog/1.14.1") + self.requires("spdlog/1.15.0") self.requires("uvw/3.4.0") self.requires("yaml-cpp/0.8.0") self.requires("robin-hood-hashing/3.11.5") - self.requires("libcurl/8.9.1") + self.requires("libcurl/8.10.1") self.requires("crashpad/cci.20220219") def build_requirements(self): diff --git a/docker/Dockerfile b/docker/Dockerfile index 04ce1bef8..597fd85e0 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==2.6.0" + pip3 install conan # need git for current hash for VERSION COPY ./.git/ /pktvisor-src/.git/