Skip to content

Commit

Permalink
SCons : Windows build on VS 2022
Browse files Browse the repository at this point in the history
  • Loading branch information
ericmehl committed Nov 11, 2024
1 parent cdf6a7a commit 762f9f7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
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
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

Expand Down
2 changes: 2 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -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)
=========
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ o.Add(
###########################################################################################

env = Environment(
MSVC_VERSION = "14.2",
MSVC_VERSION = "14.3",
options = o
)

Expand Down

0 comments on commit 762f9f7

Please sign in to comment.