ci: Enable Windows 2022 CI tests (#4195)

Needed some fixups with its python version to get it fully working. Signed-off-by: Larry Gritz <[email protected]>
AcademySoftwareFoundation · Mar 22, 2024 · 3ec1c1d · 3ec1c1d
1 parent 7409fdb
commit 3ec1c1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -550,14 +550,13 @@ jobs:
             openexr_ver: v3.2.2
             python_ver: 3.7
             # simd: sse4.2
-          # - desc: windows-2022
-          #   runner: windows-2022
-          #   vsver: 2022
-          #   generator: "Visual Studio 17 2022"
-          #   openexr_ver: v3.2.2
-          #   # v3.1.4
-          #   python_ver: 3.7
-          #   # simd: AVX2
+          - desc: windows-2022
+            runner: windows-2022
+            vsver: 2022
+            generator: "Visual Studio 17 2022"
+            openexr_ver: v3.2.2
+            python_ver: "3.9"
+            # simd: sse4.2
     runs-on: ${{ matrix.runner }}
     env:
       PYTHON_VERSION: ${{matrix.python_ver}}

diff --git a/src/build-scripts/gh-win-installdeps.bash b/src/build-scripts/gh-win-installdeps.bash
@@ -32,8 +32,8 @@ elif [[ "$PYTHON_VERSION" == "3.7" ]] ; then
     export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.7.9/x64/python.exe"
     export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
 elif [[ "$PYTHON_VERSION" == "3.9" ]] ; then
-    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.9.10/x64"
-    export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.9.10/x64/python3.exe"
+    export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.9.13/x64"
+    export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.9.13/x64/python3.exe"
     export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
 fi
 pip install numpy