From 8bb26fc6cff90d4284b72bc3670e3aa2e5bccc4f Mon Sep 17 00:00:00 2001 From: John Haddon Date: Mon, 28 Mar 2022 14:52:56 +0100 Subject: [PATCH] CI : Update to GafferHQ/dependencies 5.0.0a3 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. --- .github/workflows/main.yml | 8 ++++---- .github/workflows/main/options.posix | 4 +++- SConstruct | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d90b90d733..3d1b375b9b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/main/options.posix b/.github/workflows/main/options.posix index 84b1abfed5..8ce444fb02 100644 --- a/.github/workflows/main/options.posix +++ b/.github/workflows/main/options.posix @@ -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" @@ -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 # ========= diff --git a/SConstruct b/SConstruct index bcbccd2a62..af8b6b4272 100644 --- a/SConstruct +++ b/SConstruct @@ -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 ] )