Skip to content

Commit e6664ec

Browse files
committed
Fix houdini CI caching
Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>
1 parent c00c7f6 commit e6664ec

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/houdini.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
key: linux-vfx-hou${{ matrix.config.hou }}-${{ matrix.config.image }}-${{ matrix.config.cxx }}-${{ steps.timestamp.outputs.timestamp }}
9797
restore-keys: linux-vfx-hou${{ matrix.config.hou }}-${{ matrix.config.image }}-${{ matrix.config.cxx }}-
9898
- name: fetch_houdini
99-
uses: actions/cache@v3
99+
uses: actions/cache/restore@v3
100100
with:
101101
path: hou
102102
key: dummy-houdini${{ matrix.config.hou }}-${{ steps.timestamp.outputs.timestamp }}

.github/workflows/weekly.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ jobs:
7474
image: aswf/ci-base:2023
7575
steps:
7676
- uses: actions/checkout@v3
77+
# We bumped from the 2021 CI image to 2023 here to fix some OpenSSL issues
78+
# with the Houdini download script. In so doing we broke some of the caching
79+
# between this job and the jobs in houdini.yml which _don't_ use the 2023
80+
# image yet. The issue is that the cache action will use zstd if it's
81+
# available to zip the cache and this causes it to be inserted with a unique
82+
# hash which images without zstd (i.e. the 2021/2022 images don't have
83+
# access to). For now, uninstall zstd here instead of installing it
84+
# everywhere and ask the LF to add zstd to the older base images.
85+
- name: remove zstd
86+
run: yum -y remove zstd
7787
- name: timestamp
7888
id: timestamp
7989
run: echo "timestamp=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
@@ -85,7 +95,7 @@ jobs:
8595
cp hou/hou.tar.gz $HOME/houdini_install/hou.tar.gz
8696
cd $HOME/houdini_install && tar -xzf hou.tar.gz && cd -
8797
- name: write_houdini_cache
88-
uses: actions/cache@v3
98+
uses: actions/cache/save@v3
8999
with:
90100
path: hou
91101
key: vdb-v5-houdini${{ matrix.config.houdini_version_str }}-${{ steps.timestamp.outputs.timestamp }}

0 commit comments

Comments
 (0)