Skip to content

Commit

Permalink
Re-establish Windows 2022 and 2025
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
lgritz committed Jan 25, 2025
1 parent 1d027b1 commit 4db1f85
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 20 deletions.
39 changes: 26 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 1 addition & 2 deletions src/build-scripts/build_openexr.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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

5 changes: 0 additions & 5 deletions src/build-scripts/gh-win-installdeps.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4db1f85

Please sign in to comment.