Skip to content

Commit 34b5b98

Browse files
committed
SCons : Windows build on VS 2022
1 parent 55eed97 commit 34b5b98

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
buildType: RELEASE
4545
containerImage: ghcr.io/gafferhq/build/build:3.0.0
4646
options: .github/workflows/main/options.posix
47-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
47+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
4848
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
4949
publish: true
5050
jobs: 4
@@ -54,25 +54,25 @@ jobs:
5454
buildType: DEBUG
5555
containerImage: ghcr.io/gafferhq/build/build:3.0.0
5656
options: .github/workflows/main/options.posix
57-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
57+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
5858
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
5959
publish: false
6060
jobs: 4
6161

6262
- name: windows
63-
os: windows-2019
63+
os: windows-2022
6464
buildType: RELEASE
6565
options: .github/workflows/main/options.windows
66-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
66+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
6767
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
6868
publish: true
6969
jobs: 4
7070

7171
- name: windows-debug
72-
os: windows-2019
72+
os: windows-2022
7373
buildType: RELWITHDEBINFO
7474
options: .github/workflows/main/options.windows
75-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
75+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
7676
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
7777
publish: false
7878
jobs: 4
@@ -81,7 +81,7 @@ jobs:
8181
os: macos-14
8282
buildType: RELEASE
8383
options: .github/workflows/main/options.posix
84-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.0.0/gafferDependencies-9.0.0-macos-arm64.tar.gz
84+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-macos-arm64.tar.gz
8585
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
8686
publish: true
8787
jobs: 3

Changes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Build
3030
- CI :
3131
- IECoreHoudini tests updated to pass on newer environments.
3232
- IECoreGL tests updated with relaxed precisions for image comparisons.
33+
- Updated to GafferHQ/dependencies 9.0.0.
34+
- Updated Windows build to use MSVC 2022.
3335

3436
10.5.10.0 (relative to 10.5.9.5)
3537
=========

SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ o.Add(
985985
###########################################################################################
986986

987987
env = Environment(
988-
MSVC_VERSION = "14.2",
988+
MSVC_VERSION = "14.3",
989989
options = o
990990
)
991991

0 commit comments

Comments
 (0)