From 4db1f85ed705c601526f22ea8cf6cfc1336dcd98 Mon Sep 17 00:00:00 2001 From: Larry Gritz Date: Fri, 24 Jan 2025 14:59:46 -0800 Subject: [PATCH] Re-establish Windows 2022 and 2025 Signed-off-by: Larry Gritz --- .github/workflows/ci.yml | 39 +++++++++++++++-------- src/build-scripts/build_openexr.bash | 3 +- src/build-scripts/gh-win-installdeps.bash | 5 --- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d1610402..9190bb362 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -605,16 +605,29 @@ jobs: # Windows 2022 / MSVS 17 case is below. It's not working yet, # work in progress. # - # - desc: Windows-2022 VS2022 - # runner: windows-2022 - # nametag: windows-2022 - # generator: "Visual Studio 17 2022" - # python_ver: "3.9" - # # opencolorio_ver: v2.2.1 - # openexr_ver: v3.3.2 - # openimageio_ver: release - # skip_tests: 1 - # skip_build: 1 - # setenvs: export LLVM_VERSION=18.1.8 - # OSL_CMAKE_FLAGS="-DUSE_LLVM_BTCODE=ON" - # OpenImageIO_BUILD_MISSING_DEPS=Freetype + - desc: Windows-2022 VS2022 + runner: windows-2022 + nametag: windows-2022 + generator: "Visual Studio 17 2022" + python_ver: "3.9" + opencolorio_ver: v2.3.2 + openexr_ver: v3.3.2 + openimageio_ver: release + skip_tests: 1 + setenvs: export LLVM_VERSION=18.1.8 + OSL_CMAKE_FLAGS="-DUSE_LLVM_BTCODE=ON" + PUGIXML_VERSION=v1.14 + OpenImageIO_BUILD_MISSING_DEPS="Freetype;TIFF;libdeflate;libjpeg-turbo" + - desc: Windows-2025 VS2022 + runner: windows-2025 + nametag: windows-2025 + generator: "Visual Studio 17 2022" + python_ver: "3.9" + opencolorio_ver: v2.3.2 + openexr_ver: v3.3.2 + openimageio_ver: release + skip_tests: 1 + setenvs: export LLVM_VERSION=18.1.8 + OSL_CMAKE_FLAGS="-DUSE_LLVM_BTCODE=ON" + PUGIXML_VERSION=v1.14 + OpenImageIO_BUILD_MISSING_DEPS="Freetype;TIFF;libdeflate;libjpeg-turbo" diff --git a/src/build-scripts/build_openexr.bash b/src/build-scripts/build_openexr.bash index 8470e65f3..06d66fa90 100755 --- a/src/build-scripts/build_openexr.bash +++ b/src/build-scripts/build_openexr.bash @@ -69,6 +69,5 @@ export OpenEXR_ROOT=$OPENEXR_INSTALL_DIR if [[ $(uname -s) != "Windows" && "${RUNNER_OS}" != "Windows" ]]; then export OPENEXR_ROOT=$OPENEXR_INSTALL_DIR fi -export OPENEXR_LIBRARY_DIR=$OPENEXR_INSTALL_DIR/lib -export LD_LIBRARY_PATH=$OPENEXR_ROOT/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=$OpenEXR_ROOT/lib:$LD_LIBRARY_PATH diff --git a/src/build-scripts/gh-win-installdeps.bash b/src/build-scripts/gh-win-installdeps.bash index 63a823126..3d9df76e8 100755 --- a/src/build-scripts/gh-win-installdeps.bash +++ b/src/build-scripts/gh-win-installdeps.bash @@ -126,11 +126,6 @@ fi echo "LLVM_ROOT = $LLVM_ROOT" -# source src/build-scripts/build_openexr.bash -# export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;$OPENEXR_ROOT" -# source src/build-scripts/build_opencolorio.bash - - mkdir -p winflexbison pushd winflexbison WFBZIP=win_flex_bison-2.5.25.zip