From 8d1d8cff508a20fd92b68d1051b84cfca9eb1917 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:55:09 -0700 Subject: [PATCH 1/6] CI : Remove `macos-arm64` job We'll be able to reinstate it at some point in the future when macOS builds of dependencies-10.x.x are available. --- .github/workflows/main.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d188f3ec2d..d045e86248 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,8 +33,7 @@ jobs: linux-gcc11, linux-debug-gcc11, windows, - windows-debug, - macos-arm64 + windows-debug ] include: @@ -77,15 +76,6 @@ jobs: 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 }} From b828bee196571eea6c9d3b42b27fbe137cf6534a Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:56:32 -0700 Subject: [PATCH 2/6] CI : Update to Windows SDK 10.0.20348.0 We take the same approach as gafferhq/gaffer to install the required SDK version as it's no longer provided by the runner. --- .github/workflows/main.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d045e86248..8ac284c2a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -84,9 +84,16 @@ jobs: - uses: actions/checkout@v4 + - 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 with: - sdk: 10.0.17763.0 + sdk: 10.0.20348.0 - name: Install toolchain (Windows) run: | From 75e9b929dae1ce9199802c65efcfe8a1665b744f Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:56:55 -0700 Subject: [PATCH 3/6] CI : Update to GafferHQ/dependencies 10.0.0 --- .github/workflows/main.yml | 8 ++++---- .github/workflows/main/options.posix | 2 +- Changes | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ac284c2a1..4df321c487 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/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 @@ -53,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 @@ -62,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 @@ -71,7 +71,7 @@ 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 diff --git a/.github/workflows/main/options.posix b/.github/workflows/main/options.posix index 09324aadf4..6eaca8cd17 100644 --- a/.github/workflows/main/options.posix +++ b/.github/workflows/main/options.posix @@ -19,7 +19,7 @@ LIBPATH = libs PYTHON = deps + "/bin/python" -pythonABIVersion = "3.10" +pythonABIVersion = "3.11" PYTHON_LINK_FLAGS = "-lpython" + pythonABIVersion diff --git a/Changes b/Changes index f3f2384f5e..c8cba59f3e 100644 --- a/Changes +++ b/Changes @@ -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) ======== From ccf04550ed8b787f618e13d23c36c887c5fcbcc0 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:00:06 -0700 Subject: [PATCH 4/6] CI : Pin action versions to a specific commit SHA As recommended by : https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions#using-third-party-actions --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4df321c487..83b2028ab3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Install Windows SDK run: | @@ -91,7 +91,7 @@ jobs: 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.20348.0 @@ -148,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 }} @@ -174,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 }} From df50dcf3826edc4b20f143cb654a836c080ba288 Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Thu, 21 Aug 2025 13:19:46 -0700 Subject: [PATCH 5/6] ShaderNetworkAlgo : Fix missing include --- src/IECoreScene/ShaderNetworkAlgo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IECoreScene/ShaderNetworkAlgo.cpp b/src/IECoreScene/ShaderNetworkAlgo.cpp index 51230dc994..3676ba3635 100644 --- a/src/IECoreScene/ShaderNetworkAlgo.cpp +++ b/src/IECoreScene/ShaderNetworkAlgo.cpp @@ -49,6 +49,7 @@ #include "boost/container/flat_map.hpp" #include "boost/regex.hpp" +#include #include #include From de8454c976a7c5e387cd1e4302a9e416381338fd Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Thu, 21 Aug 2025 15:21:31 -0700 Subject: [PATCH 6/6] SConstruct : Fix building with USD 25.05 on Windows --- SConstruct | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SConstruct b/SConstruct index a28df94e59..e504e134f9 100644 --- a/SConstruct +++ b/SConstruct @@ -2094,6 +2094,13 @@ 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, + # 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 ] @@ -2101,6 +2108,9 @@ 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",