CI : Update to GafferHQ/dependencies 9.0.0a1 #6016
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnhaddon
reviewed
Aug 28, 2024
| @@ -80,6 +82,7 @@ def __assertShaderLoads( self, name, expectedParameters, expectedOutputs ) : | |||
|
|
|||
| def testLoadUsdPreviewSurface( self ) : | |||
|
|
|||
| legacyUsdVersion = pxr.Usd.GetVersion()[1] <= 23 | |||
There was a problem hiding this comment.
Normally I'd say that you need to compare both major and minor versions to be safe here, to account for minor resetting when major bumps. But I have no idea what major even is in USD, since minor is the year.
Comment on lines
105
to
106
| ( "surface", Gaffer.Plug if legacyUsdVersion else Gaffer.StringPlug, None if legacyUsdVersion else "" ), | ||
| ( "displacement", Gaffer.Plug if legacyUsdVersion else Gaffer.StringPlug, None if legacyUsdVersion else "" ), |
There was a problem hiding this comment.
I'm going to spend a bit of time today to see if there might be some way of keeping the original behaviour. I'll hold off merging pending the results of that.
We'll no longer be able to use our CentOS 7 GCC9 build container once GitHub drops support for node16 actions in October.
Disabling compression can cut the artifact upload time from minutes to seconds.
Temporary override until we have a gafferDependencies-9.0.0a1-windows release package.
Added as a platform-specific library while we figure out the Windows dependencies 9.0.0a1 builds.
murraystevenson
force-pushed
the
dependencies9
branch
from
32a24e8
to
847217f
Compare
|
Merging with the USDShaderTest commit dropped now that #6017 is in place. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates
mainto use the new9.0.0a1dependencies package.Given CentOS 7's end of life and GitHub's intended removal of support for Actions that can run on CentOS 7 in October, this takes the opportunity to remove use of our CentoOS 7 GCC9 build container and only publish GCC11 builds from
main, which allows us to remove the node16 workaround and update to the supported node20 versions of Actions necessary for CI.Windows builds remain using
cortex-10.5.9.1for the time being, as we don't yet have agafferDependencies-9.0.0a1-windowsrelease. There are a few Cycles 4.2 specific changes that will need to be made once we have that Windows dependencies release.