Merge pull request #710 from CesiumGS/conan-1.64.0-follow-up

Use Conan 1.64.0 in CI and docker
CesiumGS · Apr 29, 2024 · bc8f6c2 · bc8f6c2
2 parents 0ccc365 + d16594d
commit bc8f6c2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -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:
@@ -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

diff --git a/docker/AlmaLinux8.Dockerfile b/docker/AlmaLinux8.Dockerfile
@@ -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

diff --git a/docker/CI.Dockerfile b/docker/CI.Dockerfile
@@ -1,4 +1,4 @@
-FROM cesiumgs/omniverse-almalinux8-build:2024-01-19
+FROM cesiumgs/omniverse-almalinux8-build:2024-04-12
 
 WORKDIR /var/app
 

diff --git a/docker/CentOS7.Dockerfile b/docker/CentOS7.Dockerfile
@@ -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

diff --git a/docs/developer-setup/README.md b/docs/developer-setup/README.md
@@ -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
@@ -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:
@@ -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.