diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f71605ebd..086a9b8347 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,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.0.0/gafferDependencies-9.0.0-linux-gcc11.tar.gz tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: true @@ -52,23 +52,23 @@ 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.0.0/gafferDependencies-9.0.0-linux-gcc11.tar.gz tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: false - 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.0.0/gafferDependencies-9.0.0-windows.zip tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: true - 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.0.0/gafferDependencies-9.0.0-windows.zip tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB publish: false diff --git a/Changes b/Changes index 59af128adb..eb7209869a 100644 --- a/Changes +++ b/Changes @@ -25,6 +25,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 d359269e9a..08b422ae14 100644 --- a/SConstruct +++ b/SConstruct @@ -985,7 +985,7 @@ o.Add( ########################################################################################### env = Environment( - MSVC_VERSION = "14.2", + MSVC_VERSION = "14.3", options = o )