From f86e0999e62cb3b719e67a73bc97b903b8cfca76 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Thu, 1 Dec 2022 14:39:05 -0800 Subject: [PATCH] CI: test against latest webp, and deal with its master->main repo change (#3695) Also be more robust to the libheif and libde265 repos being occasionally down. --- .github/workflows/ci.yml | 4 ++-- src/build-scripts/gh-installdeps.bash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b1a4bcedc8..ae0cef679f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -250,7 +250,7 @@ jobs: PTEX_VERSION=v2.4.0 PUGIXML_VERSION=v1.12.1 USE_OPENVDB=0 - WEBP_VERSION=v1.2.1 + WEBP_VERSION=v1.2.4 # The installed OpenVDB has a TLS conflict with Python 3.8 - desc: bleeding edge gcc12 C++20 py3.10 OCIO/libtiff/exr-master boost1.74 avx2 nametag: linux-bleeding-edge @@ -271,7 +271,7 @@ jobs: PTEX_VERSION=main PUGIXML_VERSION=master USE_OPENVDB=0 - WEBP_VERSION=master + WEBP_VERSION=main OIIO_CMAKE_FLAGS="-DFORTIFY_SOURCE=2" # The installed OpenVDB has a TLS conflict with Python 3.8 - desc: clang14 C++20 avx2 exr3.1 ocio2.1 diff --git a/src/build-scripts/gh-installdeps.bash b/src/build-scripts/gh-installdeps.bash index 032e22a517..3f0b397b42 100755 --- a/src/build-scripts/gh-installdeps.bash +++ b/src/build-scripts/gh-installdeps.bash @@ -80,9 +80,9 @@ else fi if [[ "$USE_LIBHEIF" != "0" ]] ; then - sudo add-apt-repository ppa:strukturag/libde265 - sudo add-apt-repository ppa:strukturag/libheif - time sudo apt-get -q install -y libheif-dev + sudo add-apt-repository ppa:strukturag/libde265 || true + sudo add-apt-repository ppa:strukturag/libheif || true + time sudo apt-get -q install -y libheif-dev || true fi export CMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu:$CMAKE_PREFIX_PATH