From 703a73ec16d75724142254a54e411e859e0afeee Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Tue, 14 Jan 2025 22:14:20 -0800 Subject: [PATCH] ci(deps): Adjust some pugixml versions (#4594) * Bump the 'latest' test to test the actual latest, 1.15. * Be sure that the 'oldest' tests actually test the oldest we support, 1.8. * Sprinkle around a couple other versions that we don't test currently. Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 7 ++++++- INSTALL.md | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0f1f33279..9dff3354ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,6 +111,7 @@ jobs: setenvs: export CMAKE_VERSION=3.18.2 PTEX_VERSION=v2.3.2 WEBP_VERSION=v1.1.0 + PUGIXML_VERSION=v1.8 depcmds: sudo rm -rf /usr/local/include/OpenEXR - desc: hobbled gcc9.3/C++17 py3.7 exr-3.1 no-sse # Use the oldest supported versions of required dependencies, and @@ -135,6 +136,7 @@ jobs: USE_JPEGTURBO=0 USE_OPENCV=0 FREETYPE_VERSION=VER-2-10-0 + PUGIXML_VERSION=v1.8 depcmds: sudo rm -rf /usr/local/include/OpenEXR runs-on: ${{ matrix.runner }} @@ -279,6 +281,7 @@ jobs: simd: "avx2,f16c" fmt_ver: 10.1.1 pybind11_ver: v2.10.0 + setenvs: PUGIXML_VERSION=v1.13 - desc: VFX2023 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15 nametag: linux-vfx2023-icc runner: ubuntu-latest @@ -318,6 +321,7 @@ jobs: simd: "avx2,f16c" fmt_ver: 10.1.1 pybind11_ver: v2.12.0 + setenvs: PUGIXML_VERSION=v1.14 - desc: VFX2024 clang/C++17 py3.11 exr3.2 ocio2.3 nametag: linux-vfx2024 runner: ubuntu-latest @@ -328,6 +332,7 @@ jobs: simd: "avx2,f16c" fmt_ver: 10.1.1 pybind11_ver: v2.12.0 + setenvs: PUGIXML_VERSION=v1.14 - desc: VFX2024 sanitizers nametag: sanitizer runner: ubuntu-latest @@ -395,7 +400,7 @@ jobs: LIBTIFF_VERSION=v4.7.0 OPENJPEG_VERSION=v2.5.2 PTEX_VERSION=v2.4.3 - PUGIXML_VERSION=v1.14 + PUGIXML_VERSION=v1.15 WEBP_VERSION=v1.5.0 FREETYPE_VERSION=VER-2-13-3 USE_OPENVDB=0 diff --git a/INSTALL.md b/INSTALL.md index 06efb915fd..bd76d47f0b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -74,7 +74,7 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**. tree, but if you want to use an external, system-installed version (as may be required by some software distributions with policies against embedding other projects), then just build with `-DUSE_EXTERNAL_PUGIXML=1`. - Any PugiXML >= 1.8 should be fine (we have tested through 1.14). + Any PugiXML >= 1.8 should be fine (we have tested through 1.15).