Merge remote-tracking branch 'upstream/main' into _imgui

Author: ssh4net

.github/PULL_REQUEST_TEMPLATE.md

@@ -30,10 +30,12 @@ instructions!
 <!-- Put an 'x' in the boxes as you complete the checklist items -->
 
 - [ ] **I have read the guidelines** on [contributions](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/CONTRIBUTING.md) and [code review procedures](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/dev/CodeReview.md).
+- [ ] **I have read the [Policy on AI Coding Assistants](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/dev/AI_Policy.md)**
+  and if I used AI coding assistants, I have an `Assisted-by: TOOL / MODEL`
+  line in the pull request description above.
 - [ ] **I have updated the documentation** if my PR adds features or changes
   behavior.
-- [ ] **I am sure that this PR's changes are tested somewhere in the
-  testsuite**.
+- [ ] **I am sure that this PR's changes are tested in the testsuite**.
 - [ ] **I have run and passed the testsuite in CI** *before* submitting the
   PR, by pushing the changes to my fork and seeing that the automated CI
   passed there. (Exceptions: If most tests pass and you can't figure out why

.github/workflows/build-steps.yml

@@ -37,12 +37,18 @@ on:
         type: string
       fmt_commit:
         type: string
+      gcc_action_ver:
+        type: string
+      llvm_action_ver:
+        type: string
       opencolorio_ver:
         type: string
       openexr_ver:
         type: string
       pybind11_ver:
         type: string
+      python_action_ver:
+        type: string
       python_ver:
         type: string
       setenvs:
@@ -80,6 +86,8 @@ on:
         type: string
       optional_deps:
         type: string
+      build_local_deps:
+        type: string
     secrets:
         PASSED_GITHUB_TOKEN:
           required: false
@@ -125,6 +133,7 @@ jobs:
       # against and testing an optional dependency, but in fact are not.
       OpenImageIO_REQUIRED_DEPS: ${{inputs.required_deps}}
       OpenImageIO_OPTIONAL_DEPS: ${{inputs.optional_deps}}
+      OpenImageIO_BUILD_LOCAL_DEPS: ${{inputs.build_local_deps}}
       SETENVS: ${{inputs.setenvs}}
       DEPCMDS: ${{inputs.depcmds}}
 
@@ -167,6 +176,22 @@ jobs:
           # path: ./ccache
           key: ${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
           restore-keys: ${{inputs.nametag}}
+      - name: Install gcc
+        if: inputs.gcc_action_ver != ''
+        run: |
+            sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+            sudo apt-get update -y
+            sudo apt-get install -y g++-${{inputs.gcc_action_ver}}
+      - name: Install python
+        if: inputs.python_action_ver != ''
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: ${{ inputs.python_action_ver }}
+      - name: Install LLVM and Clang
+        if: inputs.llvm_action_ver != ''
+        uses: KyleMayes/install-llvm-action@ebc0426251bc40c7cd31162802432c68818ab8f0 # v2.0.9
+        with:
+          version: ${{ inputs.llvm_action_ver }}
       - name: Dependencies
         shell: bash
         run: |