From 34b5b9857e1f6ed5d8548a774fbc7ac5d41185ac Mon Sep 17 00:00:00 2001 From: Eric Mehl Date: Thu, 12 Sep 2024 10:04:32 -0400 Subject: [PATCH] SCons : Windows build on VS 2022 --- .github/workflows/main.yml | 14 +++++++------- Changes | 2 ++ SConstruct | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7a749051e8..96060b235f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,7 +44,7 @@ jobs: buildType: RELEASE containerImage: ghcr.io/gafferhq/build/build:3.0.0 options: .github/workflows/main/options.posix - dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz + dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: true jobs: 4 @@ -54,25 +54,25 @@ jobs: buildType: DEBUG containerImage: ghcr.io/gafferhq/build/build:3.0.0 options: .github/workflows/main/options.posix - dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz + dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: false jobs: 4 - name: windows - os: windows-2019 + os: windows-2022 buildType: RELEASE options: .github/workflows/main/options.windows - dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip + dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: true jobs: 4 - name: windows-debug - os: windows-2019 + os: windows-2022 buildType: RELWITHDEBINFO options: .github/workflows/main/options.windows - dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip + dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: false jobs: 4 @@ -81,7 +81,7 @@ jobs: os: macos-14 buildType: RELEASE options: .github/workflows/main/options.posix - dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.0.0/gafferDependencies-9.0.0-macos-arm64.tar.gz + dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-macos-arm64.tar.gz tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: true jobs: 3 diff --git a/Changes b/Changes index c5be5cd683..5c089356d2 100644 --- a/Changes +++ b/Changes @@ -30,6 +30,8 @@ Build - CI : - IECoreHoudini tests updated to pass on newer environments. - IECoreGL tests updated with relaxed precisions for image comparisons. + - Updated to GafferHQ/dependencies 9.0.0. + - Updated Windows build to use MSVC 2022. 10.5.10.0 (relative to 10.5.9.5) ========= diff --git a/SConstruct b/SConstruct index d6d2f637e8..63e8f7ad8d 100644 --- a/SConstruct +++ b/SConstruct @@ -985,7 +985,7 @@ o.Add( ########################################################################################### env = Environment( - MSVC_VERSION = "14.2", + MSVC_VERSION = "14.3", options = o )