@@ -134,9 +134,11 @@ jobs:
134134 run : |
135135 curl --silent https://unofficial-builds.nodejs.org/download/release/v20.18.1/node-v20.18.1-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217 -f -
136136 - name : Checkout repo
137- # The one we wish we could use is:
138- # uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
139- # But 4.3.0 is the newest that works for our ASWF VFX Platform 2022 containers.
137+ if : inputs.old_node != '1'
138+ uses : actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
139+ - name : Checkout repo-OLD
140+ if : inputs.old_node == '1'
141+ # Must use an old checkout action for old containers
140142 uses : actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
141143 - name : Build setup
142144 shell : bash
@@ -148,10 +150,17 @@ jobs:
148150 shell : bash
149151 run : echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
150152 - name : ccache-restore
153+ if : inputs.old_node != '1'
151154 id : ccache-restore
152- # The one we wish we could use is:
153- # uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
154- # But 4.3.0 is the newest that works for our ASWF VFX Platform 2022 containers.
155+ uses : actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
156+ with :
157+ path : ${{ env.CCACHE_DIR }}
158+ key : ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
159+ restore-keys : ${{inputs.nametag}}
160+ - name : ccache-restore-OLD
161+ if : inputs.old_node == '1'
162+ id : ccache-restore-old
163+ # Must use an old cache restore action for old containers
155164 uses : actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
156165 with :
157166 path : ${{ env.CCACHE_DIR }}
@@ -191,10 +200,16 @@ jobs:
191200 src/build-scripts/ci-build.bash
192201 popd
193202 - name : ccache-save
203+ if : inputs.old_node != '1'
194204 id : ccache-save
195- # The one we wish we could use is:
196- # uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
197- # But 4.3.0 is the newest that works for our ASWF VFX Platform 2022 containers.
205+ uses : actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
206+ with :
207+ path : ${{ env.CCACHE_DIR }}
208+ key : ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
209+ - name : ccache-save-OLD
210+ if : inputs.old_node == '1'
211+ id : ccache-save-old
212+ # Must use an old cache action for old containers
198213 uses : actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
199214 with :
200215 path : ${{ env.CCACHE_DIR }}
@@ -241,7 +256,23 @@ jobs:
241256 time make sphinx
242257 - name : Upload testsuite debugging artifacts
243258 uses : actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
244- if : ${{ failure() || inputs.build_docs == '1' || inputs.benchmark == '1' || inputs.abi_check != '' }}
259+ if : ${{ inputs.old_node != '1' && (failure() || inputs.build_docs == '1' || inputs.benchmark == '1' || inputs.abi_check != '') }}
260+ with :
261+ name : oiio-${{github.job}}-${{inputs.nametag}}
262+ path : |
263+ build/cmake-save
264+ build/compat_reports
265+ build/sphinx
266+ build/benchmarks
267+ build/testsuite/*/*.*
268+ !build/testsuite/oiio-images
269+ !build/testsuite/openexr-images
270+ !build/testsuite/fits-images
271+ !build/testsuite/j2kp4files_v1_5
272+ ${{ inputs.extra_artifacts }}
273+ - name : Upload testsuite debugging artifacts-OLD
274+ uses : actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
275+ if : ${{ inputs.old_node == '1' && (failure() || inputs.build_docs == '1' || inputs.benchmark == '1' || inputs.abi_check != '') }}
245276 with :
246277 name : oiio-${{github.job}}-${{inputs.nametag}}
247278 path : |
0 commit comments