Merge branch 'AcademySoftwareFoundation:main' into CUDA

Author: 1div0

.github/workflows/build-steps.yml

@@ -134,9 +134,11 @@ jobs:
         run: |
           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 -
       - name: Checkout repo
-        # The one we wish we could use is:
-        # uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        # But 4.3.0 is the newest that works for our ASWF VFX Platform 2022 containers.
+        if: inputs.old_node != '1'
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Checkout repo-OLD
+        if: inputs.old_node == '1'
+        # Must use an old checkout action for old containers
         uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
       - name: Build setup
         shell: bash
@@ -148,10 +150,17 @@ jobs:
         shell: bash
         run: echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
       - name: ccache-restore
+        if: inputs.old_node != '1'
         id: ccache-restore
-        # The one we wish we could use is:
-        # uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        # But 4.3.0 is the newest that works for our ASWF VFX Platform 2022 containers.
+        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
+          restore-keys: ${{inputs.nametag}}
+      - name: ccache-restore-OLD
+        if: inputs.old_node == '1'
+        id: ccache-restore-old
+        # Must use an old cache restore action for old containers
         uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ${{ env.CCACHE_DIR }}
@@ -191,10 +200,16 @@ jobs:
             src/build-scripts/ci-build.bash
             popd
       - name: ccache-save
+        if: inputs.old_node != '1'
         id: ccache-save
-        # The one we wish we could use is:
-        # uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        # But 4.3.0 is the newest that works for our ASWF VFX Platform 2022 containers.
+        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
+      - name: ccache-save-OLD
+        if: inputs.old_node == '1'
+        id: ccache-save-old
+        # Must use an old cache action for old containers
         uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
         with:
           path: ${{ env.CCACHE_DIR }}
@@ -241,7 +256,23 @@ jobs:
             time make sphinx
       - name: Upload testsuite debugging artifacts
         uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
-        if: ${{ failure() || inputs.build_docs == '1' || inputs.benchmark == '1' || inputs.abi_check != '' }}
+        if: ${{ inputs.old_node != '1' && (failure() || inputs.build_docs == '1' || inputs.benchmark == '1' || inputs.abi_check != '') }}
+        with:
+          name: oiio-${{github.job}}-${{inputs.nametag}}
+          path: |
+            build/cmake-save
+            build/compat_reports
+            build/sphinx
+            build/benchmarks
+            build/testsuite/*/*.*
+            !build/testsuite/oiio-images
+            !build/testsuite/openexr-images
+            !build/testsuite/fits-images
+            !build/testsuite/j2kp4files_v1_5
+            ${{ inputs.extra_artifacts }}
+      - name: Upload testsuite debugging artifacts-OLD
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        if: ${{ inputs.old_node == '1' && (failure() || inputs.build_docs == '1' || inputs.benchmark == '1' || inputs.abi_check != '') }}
         with:
           name: oiio-${{github.job}}-${{inputs.nametag}}
           path: |

src/doc/oiiotool.rst

@@ -269,7 +269,7 @@ Control flow
 Scriptability is provided by the use of control flow statements.
 The usual programming constructs are supported:
 
-* Conditionals : `--if` *condition* `--then` *commands...* `--else` *commands...* `--endif`
+* Conditionals : `--if` *condition* *commands...* `--else` *commands...* `--endif`
 
 * General looping: `--while` *condition* *commands...* `--endwhile`