Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Conan 1.64.0 in CI and docker #710

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Use Conan 1.64.0 in CI and docker #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0beef3f
Use conan 1.64.0 in CI and docker
lilleyse Apr 12, 2024
d16594d
Use conan 1.63.0
lilleyse Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
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.63.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.63.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
View file
Open in desktop
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.63.0 && \
pip3 install gcovr

WORKDIR /var/app
Expand Down
2 changes: 1 addition & 1 deletion docker/CI.Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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.63.0 && \
pip3 install gcovr

WORKDIR /var/app
Expand Down
6 changes: 3 additions & 3 deletions docs/developer-setup/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ See [Linux](#linux) or [Windows](#windows) for step-by-step installation instruc
```
- Install Conan with pip because Conan is not in Ubuntu's package manager
```sh
sudo pip3 install conan==1.64.0
sudo pip3 install conan==1.63.0
```
- Install `cmake-format`
```sh
Expand Down Expand Up @@ -135,7 +135,7 @@ There are two ways to install prerequisites for Windows, [manually](#install-man
```
- Install Conan
```sh
pip3 install conan==1.64.0
pip3 install conan==1.63.0
```
- Install Doxygen: https://www.doxygen.nl/download.html
- After installation, add the install location to your `PATH`. Open PowerShell as administrator and enter:
Expand All @@ -162,7 +162,7 @@ There are two ways to install prerequisites for Windows, [manually](#install-man
choco install -y llvm --version=15.0.7
```
```sh
choco install -y conan --version 1.64.0
choco install -y conan --version 1.63.0
```
> **Note:** If you see a warning like `Chocolatey detected you are not running from an elevated command shell`, reopen Command Prompt as administrator
- Create a symbolic link called `python3.exe` that points to the actual `python` (version 3.x) executable. This is necessary for some of the scripts to run correctly when `#!/usr/bin/env python3` is at the top of the file.
Expand Down
Loading