Skip to content

Commit

Permalink
Use conan 1.64.0 in CI and docker
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Apr 12, 2024
1 parent 02f16d2 commit 0beef3f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
run: |
sudo apt update
sudo apt install -y doxygen clang-tidy-15 gcovr nvidia-driver-535
sudo pip3 install conan==1.60.0 black==23.1.0 flake8==6.0.0
sudo pip3 install conan==1.64.0 black==23.1.0 flake8==6.0.0
# Could not figure out how to add Chocolatey libraries to the PATH automatically with refreshenv, so
# hardcoding their locations instead. Followed these instructions for adding to the PATH on PowerShell:
Expand All @@ -133,7 +133,7 @@ jobs:
- name: Install Windows dependencies
if: runner.os == 'Windows'
run: |
choco install -y conan --version 1.60.0
choco install -y conan --version 1.64.0
choco install -y llvm --version=15.0.7 --allow-downgrade
pip3 install black==23.1.0 flake8==6.0.0 requests
echo "C:/Program Files/conan/conan" >> $env:GITHUB_PATH
Expand Down
2 changes: 1 addition & 1 deletion docker/AlmaLinux8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ RUN wget https://cmake.org/files/v3.24/cmake-3.24.2.tar.gz && \
ln -sf /usr/local/bin/ctest /usr/bin/ctest && \
ln -sf /usr/local/bin/cpack /usr/bin/cpack

RUN pip3 install conan==1.60.0 && \
RUN pip3 install conan==1.64.0 && \
pip3 install gcovr

WORKDIR /var/app
Expand Down
2 changes: 1 addition & 1 deletion docker/CI.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cesiumgs/omniverse-almalinux8-build:2024-01-19
FROM cesiumgs/omniverse-almalinux8-build:2024-04-12

WORKDIR /var/app

Expand Down
2 changes: 1 addition & 1 deletion docker/CentOS7.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN wget https://cmake.org/files/v3.24/cmake-3.24.2.tar.gz && \
ln -sf /usr/local/bin/ctest /usr/bin/ctest && \
ln -sf /usr/local/bin/cpack /usr/bin/cpack

RUN pip3 install conan==1.60.0 && \
RUN pip3 install conan==1.64.0 && \
pip3 install gcovr

WORKDIR /var/app
Expand Down

0 comments on commit 0beef3f

Please sign in to comment.