From 0beef3fb0bb5ba8e4e9c4ea1303e1cb9f59dbc16 Mon Sep 17 00:00:00 2001
From: Sean Lilley <lilleyse@gmail.com>
Date: Fri, 12 Apr 2024 11:58:30 -0400
Subject: [PATCH] Use conan 1.64.0 in CI and docker

---
 .github/workflows/main.yml   | 4 ++--
 docker/AlmaLinux8.Dockerfile | 2 +-
 docker/CI.Dockerfile         | 2 +-
 docker/CentOS7.Dockerfile    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3dba0b17..199851c5 100644
--- 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.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:
@@ -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
diff --git a/docker/AlmaLinux8.Dockerfile b/docker/AlmaLinux8.Dockerfile
index 2eec4d2a..a96e364c 100644
--- 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.64.0 && \
     pip3 install gcovr
 
 WORKDIR /var/app
diff --git a/docker/CI.Dockerfile b/docker/CI.Dockerfile
index 17fd888f..2338ca39 100644
--- 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
index 5ecab016..a691e673 100644
--- 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.64.0 && \
     pip3 install gcovr
 
 WORKDIR /var/app