From e6664ec62cfd9e2d43eb32f0bc5dd7bdf68add90 Mon Sep 17 00:00:00 2001
From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
Date: Wed, 18 Oct 2023 11:32:40 +1300
Subject: [PATCH 1/2] Fix houdini CI caching

Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
---
 .github/workflows/houdini.yml |  2 +-
 .github/workflows/weekly.yml  | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/houdini.yml b/.github/workflows/houdini.yml
index 3f6b539ece..81f9709e7d 100644
--- a/.github/workflows/houdini.yml
+++ b/.github/workflows/houdini.yml
@@ -96,7 +96,7 @@ jobs:
         key: linux-vfx-hou${{ matrix.config.hou }}-${{ matrix.config.image }}-${{ matrix.config.cxx }}-${{ steps.timestamp.outputs.timestamp }}
         restore-keys: linux-vfx-hou${{ matrix.config.hou }}-${{ matrix.config.image }}-${{ matrix.config.cxx }}-
     - name: fetch_houdini
-      uses: actions/cache@v3
+      uses: actions/cache/restore@v3
       with:
         path: hou
         key: dummy-houdini${{ matrix.config.hou }}-${{ steps.timestamp.outputs.timestamp }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
index c7e9a8333f..0dc2cd8ae4 100644
--- a/.github/workflows/weekly.yml
+++ b/.github/workflows/weekly.yml
@@ -74,6 +74,16 @@ jobs:
       image: aswf/ci-base:2023
     steps:
     - uses: actions/checkout@v3
+    # We bumped from the 2021 CI image to 2023 here to fix some OpenSSL issues
+    # with the Houdini download script. In so doing we broke some of the caching
+    # between this job and the jobs in houdini.yml which _don't_ use the 2023
+    # image yet. The issue is that the cache action will use zstd if it's
+    # available to zip the cache and this causes it to be inserted with a unique
+    # hash which images without zstd (i.e. the 2021/2022 images don't have
+    # access to). For now, uninstall zstd here instead of installing it
+    # everywhere and ask the LF to add zstd to the older base images.
+    - name: remove zstd
+      run: yum -y remove zstd
     - name: timestamp
       id: timestamp
       run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
@@ -85,7 +95,7 @@ jobs:
         cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz
         cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
     - name: write_houdini_cache
-      uses: actions/cache@v3
+      uses: actions/cache/save@v3
       with:
         path: hou
         key: vdb-v5-houdini${{ matrix.config.houdini_version_str }}-${{ steps.timestamp.outputs.timestamp }}

From 35808213e663612bb3a8d9c8420e4d7ecb5f79c1 Mon Sep 17 00:00:00 2001
From: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
Date: Thu, 19 Oct 2023 17:04:12 +1300
Subject: [PATCH 2/2] Minor spelling fix in README

Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b70edb4064..f16e03c451 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ cmake --build . --parallel 4 --config Release --target install
 #### Building OpenVDB AX and NanoVDB
 
 OpenVDB AX depends on the core OpenVDB library. NanoVDB can be built with and
-without OpenVDB support. Note that NanoVDB has its own build instructuins, see
+without OpenVDB support. Note that NanoVDB has its own build instructions, see
 the [NanoVDB build documentation](https://www.openvdb.org/documentation/doxygen/NanoVDB_HowToBuild.html)
 for details.