Skip to content

CI : Update to GafferHQ/dependencies 10.0.0 #1481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: RB-10.6
Choose a base branch
from
Open

CI : Update to GafferHQ/dependencies 10.0.0 #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d1d8cf
CI : Remove `macos-arm64` job
murraystevenson Aug 20, 2025
b828bee
CI : Update to Windows SDK 10.0.20348.0
murraystevenson Aug 20, 2025
75e9b92
CI : Update to GafferHQ/dependencies 10.0.0
murraystevenson Aug 20, 2025
ccf0455
CI : Pin action versions to a specific commit SHA
murraystevenson Aug 20, 2025
df50dcf
ShaderNetworkAlgo : Fix missing include
murraystevenson Aug 21, 2025
de8454c
SConstruct : Fix building with USD 25.05 on Windows
murraystevenson Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ jobs:
linux-gcc11,
linux-debug-gcc11,
windows,
windows-debug,
macos-arm64
windows-debug
]

include:
Expand All @@ -44,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/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-linux-gcc11.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: true
jobs: 4
Expand All @@ -54,7 +53,7 @@ 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/9.1.0/gafferDependencies-9.1.0-linux-gcc11.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-linux-gcc11.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: false
jobs: 4
Expand All @@ -63,7 +62,7 @@ jobs:
os: windows-2022
buildType: RELEASE
options: .github/workflows/main/options.windows
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-windows.zip
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: true
jobs: 4
Expand All @@ -72,31 +71,29 @@ jobs:
os: windows-2022
buildType: RELWITHDEBINFO
options: .github/workflows/main/options.windows
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/9.1.0/gafferDependencies-9.1.0-windows.zip
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-windows.zip
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: false
jobs: 4

- name: macos-arm64
os: macos-14
buildType: RELEASE
options: .github/workflows/main/options.posix
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

runs-on: ${{ matrix.os }}

container: ${{ matrix.containerImage }}

steps:

- uses: actions/checkout@v4
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Install Windows SDK
run: |
curl.exe -L --output winsdksetup.exe --url https://download.microsoft.com/download/9/7/9/97982c1d-d687-41be-9dd3-6d01e52ceb68/windowssdk/winsdksetup.exe
Start-Process ./winsdksetup.exe -ArgumentList "/Features OptionId.DesktopCPPx64 /Quiet /NoRestart" -NoNewWindow -Wait
shell: pwsh
if: runner.os == 'Windows'

- uses: ilammy/msvc-dev-cmd@v1.13.0
- uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
with:
sdk: 10.0.17763.0
sdk: 10.0.20348.0

- name: Install toolchain (Windows)
run: |
Expand Down Expand Up @@ -151,7 +148,7 @@ jobs:
shell: bash

- name: Cache
uses: actions/cache@v4
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: sconsCache
key: ${{ runner.os }}-${{ matrix.containerImage }}-${{env.CORTEX_DEPENDENCIES_HASH}}-${{ matrix.buildType }}-${{ github.sha }}
Expand All @@ -177,7 +174,7 @@ jobs:
${{ env.PACKAGE_COMMAND }} ${{ env.CORTEX_BUILD_NAME }}.${{env.PACKAGE_EXTENSION}} ${{ env.CORTEX_BUILD_NAME }}
if: matrix.publish

- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: ${{ env.CORTEX_BUILD_NAME }}
path: ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main/options.posix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LIBPATH = libs

PYTHON = deps + "/bin/python"

pythonABIVersion = "3.10"
pythonABIVersion = "3.11"

PYTHON_LINK_FLAGS = "-lpython" + pythonABIVersion

Expand Down
3 changes: 3 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
10.6.x.x (relative to 10.6.0.0)
========

Build
-----

- CI : Updated to GafferHQ/dependencies 10.0.0.

10.6.0.0 (relative to 10.5.15.2)
========
Expand Down
10 changes: 10 additions & 0 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,13 +2094,23 @@ else :
"work"
]

if env["PLATFORM"] == "win32" :
pxrVersionHeader = env.FindFile( "pxr/pxr.h", dependencyIncludes )
if pxrVersionHeader is not None and "#define PXR_USE_INTERNAL_BOOST_PYTHON\n" in open( str( pxrVersionHeader ) ) :
# Windows builds currently require both boost_python and USD's internal library,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the story here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit of an odd one. From this patch, it appears this is how Cortex has been built for the dependencies-10 Windows releases Linking only to boost_python results in one set of missing symbols, and linking only to usd_python results in another.

# ideally we'd only link to one of them...
usdLibs.append( "python" )

if usdEnv["USD_LIB_PREFIX"] :
usdLibs = [ usdEnv["USD_LIB_PREFIX"] + x for x in usdLibs ]

usdEnvAppends = {
"CXXFLAGS" : [
"-Wno-deprecated" if env["PLATFORM"] != "win32" else "",
"/Zc:inline-" if env["PLATFORM"] == "win32" else "",
# This warning is already disabled generally for release builds,
# but also requires disabling for debug builds with USD.
"/wd4702" if env["PLATFORM"] == "win32" else "",
"-DIECoreUSD_EXPORTS",
systemIncludeArgument, "$USD_INCLUDE_PATH",
systemIncludeArgument, "$PYTHON_INCLUDE_PATH",
Expand Down
1 change: 1 addition & 0 deletions src/IECoreScene/ShaderNetworkAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
#include "boost/container/flat_map.hpp"
#include "boost/regex.hpp"

#include <array>
#include <unordered_map>
#include <unordered_set>

Expand Down