Skip to content

Commit

Permalink
install latest conan
Browse files Browse the repository at this point in the history
  • Loading branch information
leoparente committed Dec 9, 2024
1 parent 250d226 commit b645ea4
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-cpp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/build-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_cross.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/build_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-ql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/conan_provider.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 6 additions & 6 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit b645ea4

Please sign in to comment.