Try to get icc and icx working by bumping them to 2023

Signed-off-by: Larry Gritz <[email protected]>

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ permissions: read-all
 
 jobs:
 
-  step_aswf:
+  aswf:
     name: "${{matrix.desc}}"
     uses: ./.github/workflows/ci-steps.yml
     with:
@@ -110,13 +110,13 @@ jobs:
             fmt_ver: 9.1.0
             pybind11_ver: v2.8.1
             setenvs: export FREETYPE_VERSION=VER-2-12-0
-          - desc: VFX20222 icc/C++17 py3.9 exr3.1 ocio2.1 qt5.15
+          - desc: VFX20223 icc/C++17 py3.10 exr3.1 ocio2.1 qt5.15
             nametag: linux-vfx2022-icc
             runner: ubuntu-latest
             container: aswf/ci-osl:2022
             vfxyear: 2022
             opencolorio_ver: v2.2.1
-            python_ver: 3.9
+            python_ver: "3.10"
             # simd: "avx2,f16c"
             fmt_ver: 7.1.3
             # icc MUST use this older FMT version
@@ -127,19 +127,18 @@ jobs:
                             DISABLE_libuhdr=1
             # For icc, use fp-model precise to eliminate needless LSB errors
             # that make test results differ from other platforms.
-          - desc: VFX20222 icx/C++17 py3.9 exr3.1 ocio2.2 qt5.15
-            nametag: linux-vfx2022-icx
+          - desc: VFX20223 icx/C++17 py3.10 exr3.1 ocio2.2 qt5.15
+            nametag: linux-vfx2023-icx
             runner: ubuntu-latest
-            container: aswf/ci-osl:2022
-            vfxyear: 2022
+            container: aswf/ci-osl:2023
+            vfxyear: 2023
             cc_compiler: icx
             cxx_compiler: icpx
-            opencolorio_ver: v2.3.2
-            python_ver: 3.9
-            pybind11_ver: v2.9.0
+            python_ver: "3.10"
+            pybind11_ver: v2.10.0
             simd: "avx2,f16c"
-            setenvs: export USE_OPENVDB=0
-                            OPENCOLORIO_CXX=g++
+            setenvs: export xUSE_OPENVDB=0
+                            xOPENCOLORIO_CXX=g++
                             UHDR_CMAKE_C_COMPILER=gcc
                             UHDR_CMAKE_CXX_COMPILER=g++
             # OCIO doesn't build with icx, so we have to force the ocio build