From 3ec1c1de4b7e737ecb8af5d22a8112ab92456622 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Fri, 22 Mar 2024 10:38:55 -0700 Subject: [PATCH] ci: Enable Windows 2022 CI tests (#4195) Needed some fixups with its python version to get it fully working. Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 15 +++++++-------- src/build-scripts/gh-win-installdeps.bash | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 13f6c8db22..61c43e39df 100644 --- 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 index cc46a2747c..9a489526b5 100755 --- 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