Skip to content

Commit

Permalink
update conan version
Browse files Browse the repository at this point in the history
  • Loading branch information
leoparente committed Dec 27, 2024
1 parent c2b944c commit 3200f03
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 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==1.64.1' --force-reinstall
pip3 install 'conan==1.66.0' --force-reinstall

RUN chmod +x /entrypoint.sh

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: Setup OSX Environment
run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: linux package install
run: |
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: Setup Conan Cache
uses: actions/cache@v4
Expand Down Expand Up @@ -393,7 +393,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: Configure CMake to generate VERSION
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: Setup Conan Cache
uses: actions/cache@v4
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: Configure CMake to generate VERSION
shell: bash
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.0

- name: Configure CMake to generate VERSION
shell: bash
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.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 @@ -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.64.1' --force-reinstall
run: pip install --no-cache-dir 'conan==1.66.0' --force-reinstall

- name: Create Conan configuration
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 1.64.1
version: 1.66.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 @@ -69,7 +69,7 @@ jobs:
- run: |
# Run Build - set up dependencies, env vars, compile, and make test
#install conan
pip install --no-cache-dir 'conan==1.64.1' --force-reinstall
pip install --no-cache-dir 'conan==1.66.0' --force-reinstall
# create conan config
CONAN_V2_MODE=1 conan config init
conan config set general.revisions_enabled=1
Expand Down

0 comments on commit 3200f03

Please sign in to comment.