Skip to content

Commit

Permalink
CI : Update to GafferHQ/dependencies 5.0.0a3
Browse files Browse the repository at this point in the history
This is what we are using for the Gaffer 0.62 test builds.

The MacOS `ImageIO.framework` workaround in the SConstruct mirrors a workaround we have had in the Gaffer wrapper for a long time. I don't know why it has only become necessary for the Cortex tests now. We also need to reset `OIIO_LIB_PATH` in `options.posix` to avoid the dependency libraries from getting re-inserted in front of `ImageIO.framework` in `imageTestEnv`. This could be avoided by refactoring the logic for building `imageTestEnv`, but I'm unsure what knock-on effects that might have for an Image Engine build. For now I'm trying to limit the changes to MacOS/GafferHQ.
  • Loading branch information
johnhaddon committed Apr 11, 2022
1 parent b782062 commit 8bb26fc
Show file tree
Hide file tree
Showing 3 changed files with 10 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 @@ -45,7 +45,7 @@ jobs:
buildType: RELEASE
containerImage: ghcr.io/gafferhq/build/build:2.0.0
options: .github/workflows/main/options.posix
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python2-linux.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-linux.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
publish: true

Expand All @@ -54,7 +54,7 @@ jobs:
buildType: DEBUG
containerImage: ghcr.io/gafferhq/build/build:2.0.0
options: .github/workflows/main/options.posix
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python2-linux.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-linux.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
publish: false

Expand All @@ -63,7 +63,7 @@ jobs:
buildType: RELEASE
containerImage: ghcr.io/gafferhq/build/build:2.0.0
options: .github/workflows/main/options.posix
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python3-linux.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-linux.tar.gz
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
publish: true

Expand All @@ -72,7 +72,7 @@ jobs:
buildType: RELEASE
containerImage:
options: .github/workflows/main/options.posix
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/4.0.0/gafferDependencies-4.0.0-Python2-osx.tar.gz
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-osx.tar.gz
# `testAppleseed` currently omitted due to clashes with system image IO frameworks.
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
publish: true
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/main/options.posix
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ BOOST_LIB_SUFFIX = ""

OPENEXR_INCLUDE_PATH = includes
OIIO_INCLUDE_PATH = includes
OIIO_LIB_PATH = libs
OIIO_LIB_PATH = ""
OSL_INCLUDE_PATH = includes
BLOSC_INCLUDE_PATH = includes
FREETYPE_INCLUDE_PATH = includes + "/freetype2"
Expand All @@ -57,7 +57,9 @@ WITH_GL = "1"
GLEW_INCLUDE_PATH = includes + "/GL"

TBB_INCLUDE_PATH = includes

USD_INCLUDE_PATH = includes
USD_LIB_PREFIX = "usd_"

# Renderers
# =========
Expand Down
3 changes: 3 additions & 0 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -1483,6 +1483,9 @@ if testEnv["TEST_LIBPATH"] != "" :
testEnvLibPath = testEnv["TEST_LIBPATH"] + os.pathsep + testEnvLibPath
testEnvLibPath = testEnv.subst( testEnvLibPath )

if testEnv["PLATFORM"] == "darwin" :
testEnvLibPath = os.pathsep.join( [ "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Resources/", testEnvLibPath ] )

testEnv["ENV"][testEnv["TEST_LIBRARY_PATH_ENV_VAR"]] = os.pathsep.join( [ testEnv["ENV"].get(testEnv["TEST_LIBRARY_PATH_ENV_VAR"], ""), testEnvLibPath ] )
if testEnv["TEST_LIBRARY_PATH_ENV_VAR"] != libraryPathEnvVar :
testEnv["ENV"][libraryPathEnvVar] = os.pathsep.join( [ testEnv["ENV"].get(libraryPathEnvVar, ""), testEnvLibPath ] )
Expand Down

0 comments on commit 8bb26fc

Please sign in to comment.