reset a bit, one workflow

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

.github/workflows/ci.yml

@@ -491,84 +491,15 @@ jobs:
                             CLANG_FORMAT_EXE=clang-format-17
 
 
-  # linux-optix:
-  #   if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'macos-only') }}
-  #   name: "${{matrix.desc}}"
-  #   uses: ./.github/workflows/build-steps.yml
-  #   with:
-  #     nametag: ${{ matrix.nametag || 'unnamed!' }}
-  #     runner: ${{ matrix.runner || 'ubuntu-latest' }}
-  #     container: ${{ matrix.container }}
-  #     container_args: ${{ matrix.container_args }}
-  #     cc_compiler: ${{ matrix.cc_compiler || 'gcc' }}
-  #     cxx_compiler: ${{ matrix.cxx_compiler || 'g++' }}
-  #     cxx_std: ${{ matrix.cxx_std || '17' }}
-  #     build_type: ${{ matrix.build_type || 'Release' }}
-  #     depcmds: ${{ matrix.depcmds }}
-  #     extra_artifacts: ${{ matrix.extra_artifacts }}
-  #     fmt_ver: ${{ matrix.fmt_ver }}
-  #     opencolorio_ver: ${{ matrix.opencolorio_ver }}
-  #     openexr_ver: ${{ matrix.openexr_ver }}
-  #     openimageio_ver: ${{ matrix.openimageio_ver }}
-  #     pybind11_ver: ${{ matrix.pybind11_ver }}
-  #     python_ver: ${{ matrix.python_ver }}
-  #     setenvs: ${{ matrix.setenvs }}
-  #     simd: ${{ matrix.simd }}
-  #     batched: ${{ matrix.batched }}
-  #     skip_build: ${{ matrix.skip_build }}
-  #     skip_tests: ${{ matrix.skip_tests }}
-  #     abi_check: ${{ matrix.abi_check }}
-  #     build_docs: ${{ matrix.build_docs }}
-  #     generator: ${{ matrix.generator }}
-  #     ctest_args: ${{ matrix.ctest_args }}
-  #     ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
-  #     coverage: ${{ matrix.coverage || 0 }}
-  #     sonar: ${{ matrix.sonar || 0 }}
-  #     llvm_action_ver: ${{ matrix.llvm_action_ver }}
-  #     clang_format: ${{ matrix.clang_format }}
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       include:
-  #         # - desc: VP2023 GPU Cuda11 gcc11/C++17 llvm15 py3.10 OIIO-main avx2
-  #         #   nametag: linux-optix7-2023
-  #         #   runner: ubuntu-latest
-  #         #   container: aswftesting/ci-osl:2023-clang15
-  #         #   cxx_std: 17
-  #         #   openimageio_ver: main
-  #         #   python_ver: "3.10"
-  #         #   pybind11_ver: v2.10.0
-  #         #   simd: avx2,f16c
-  #         #   skip_tests: 1
-  #         #   setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
-  #         #                   OPTIX_VERSION=7.0.0
-  #         #                   OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-  #         - desc: VP2025 gcc11/C++17 llvm19 py3.11 oiio-rel avx2
-  #           nametag: linux-optix-vfx2025
-  #           runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-20.04-gpu-t4-4c-16g-176h') || 'ubuntu-latest' }}
-  #           # runner: ${{ (github.repository_owner == 'AcademySoftwareFoundation' && 'ubuntu-22.04-8c-32g-300h') || 'ubuntu-latest' }}
-  #           container: aswf/ci-osl:2025
-  #           # container_options: --gpus all,capabilities=compute,utility
-  #           cxx_std: 17
-  #           # openimageio_ver: release
-  #           python_ver: "3.11"
-  #           pybind11_ver: v2.11.1
-  #           simd: avx2,f16c
-  #           setenvs: export OSL_CMAKE_FLAGS="-DOSL_USE_OPTIX=1"
-  #                           OPTIX_VERSION=9.0.0
-  #                           OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=9.1.0
-  #           # setenvs: export CONAN_PACKAGES="ptex/2.4.2@aswf/vfx2024"
-
-
   macos:
-    if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'gpu-only') }}
+    if: ${{ ! contains(github.ref, 'windows-only') && ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'optix-only') }}
     name: "${{matrix.desc}}"
     uses: ./.github/workflows/build-steps.yml
     with:
       nametag: ${{ matrix.nametag || 'unnamed!' }}
       runner: ${{ matrix.runner }}
       container: ${{ matrix.container }}
-      container_options: ${{ matrix.container_options }}
+      container_options: ${{ matrix.container_options || '-e A=x' }}
       cc_compiler: ${{ matrix.cc_compiler || 'clang' }}
       cxx_compiler: ${{ matrix.cxx_compiler || 'clang++' }}
       cxx_std: ${{ matrix.cxx_std || '17' }}
@@ -631,14 +562,14 @@ jobs:
 
 
   windows:
-    if: ${{ ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'gpu-only') }}
+    if: ${{ ! contains(github.ref, 'linux-only') && ! contains(github.ref, 'macos-only') && ! contains(github.ref, 'optix-only') }}
     name: "${{matrix.desc}}"
     uses: ./.github/workflows/build-steps.yml
     with:
       nametag: ${{ matrix.nametag || 'unnamed!' }}
       runner: ${{ matrix.runner }}
       container: ${{ matrix.container }}
-      container_options: ${{ matrix.container_options }}
+      container_options: ${{ matrix.container_options || '-e A=x' }}
       cc_compiler: ${{ matrix.cc_compiler }}
       cxx_compiler: ${{ matrix.cxx_compiler }}
       cxx_std: ${{ matrix.cxx_std || '17' }}