Skip to content

Commit 339449f

Browse files
authored
ci: Windows runners switched which python version they had (#5010)
Yay, I love how these things just break with no notice. Fixes CI that broke a couple days agi. --------- Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 5f8fcc4 commit 339449f

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,13 +695,13 @@ jobs:
695695
nametag: windows-2022
696696
vsver: 2022
697697
generator: "Visual Studio 17 2022"
698-
python_ver: "3.9"
698+
python_ver: "3.12"
699699
setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
700700
- desc: Windows-2025 VS2022
701701
runner: windows-2025
702702
nametag: windows-2025
703703
vsver: 2022
704704
generator: "Visual Studio 17 2022"
705-
python_ver: "3.9"
705+
python_ver: "3.12"
706706
setenvs: export OPENIMAGEIO_PYTHON_LOAD_DLLS_FROM_PATH=1
707707
benchmark: 1

src/build-scripts/gh-win-installdeps.bash

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ elif [[ "$PYTHON_VERSION" == "3.9" ]] ; then
3232
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.9.13/x64"
3333
export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.9.13/x64/python3.exe"
3434
export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
35+
elif [[ "$PYTHON_VERSION" == "3.12" ]] ; then
36+
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;/c/hostedtoolcache/windows/Python/3.12.10/x64"
37+
export Python_EXECUTABLE="/c/hostedtoolcache/windows/Python/3.12.10/x64/python3.exe"
38+
export PYTHONPATH=$OpenImageIO_ROOT/lib/python${PYTHON_VERSION}/site-packages
3539
fi
3640
pip install numpy
3741

src/cmake/testing.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ macro (oiio_add_tests)
110110
"OIIO_TESTSUITE_ROOT=${_testsuite}"
111111
"OIIO_TESTSUITE_SRC=${_testsrcdir}"
112112
"OIIO_TESTSUITE_CUR=${_testdir}"
113+
"Python_EXECUTABLE=${Python3_EXECUTABLE}"
113114
${_ats_ENVIRONMENT})
114115
if (NOT ${_ats_testdir} STREQUAL "")
115116
set_property(TEST ${_testname} APPEND PROPERTY ENVIRONMENT

testsuite/runtest.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,7 @@ def newsymlink(src: str, dst: str):
162162
if os.getenv("Python_EXECUTABLE") :
163163
pythonbin = os.getenv("Python_EXECUTABLE")
164164
else :
165-
pythonbin = 'python'
166-
if os.getenv("PYTHON_VERSION") :
167-
pythonbin += os.getenv("PYTHON_VERSION")
165+
pythonbin = sys.executable
168166
#print ("pythonbin = ", pythonbin)
169167

170168

0 commit comments

Comments
 (0)