From e4093e941eeb77b0c850660626bfb1765e745018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Thu, 27 Apr 2023 12:44:30 -0400 Subject: [PATCH 1/8] Tentative fix for macos failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- share/ci/scripts/multi/install_osl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/share/ci/scripts/multi/install_osl.sh b/share/ci/scripts/multi/install_osl.sh index a7ac19de87..244cf84a61 100755 --- a/share/ci/scripts/multi/install_osl.sh +++ b/share/ci/scripts/multi/install_osl.sh @@ -29,6 +29,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DVERBOSE=ON \ -DSTOP_ON_WARNING=OFF \ -DBoost_NO_BOOST_CMAKE=ON \ + -DLLVM_ROOT=$(brew --prefix llvm) \ ../. cmake --build . \ --target install \ From dd17d742f327fce3ab9b3304712f149eb7f2dfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Thu, 27 Apr 2023 12:49:11 -0400 Subject: [PATCH 2/8] checking for llvm@15 instead as that version is installed by homebrew in the runner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- share/ci/scripts/multi/install_osl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/ci/scripts/multi/install_osl.sh b/share/ci/scripts/multi/install_osl.sh index 244cf84a61..f0cb450b08 100755 --- a/share/ci/scripts/multi/install_osl.sh +++ b/share/ci/scripts/multi/install_osl.sh @@ -29,7 +29,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DVERBOSE=ON \ -DSTOP_ON_WARNING=OFF \ -DBoost_NO_BOOST_CMAKE=ON \ - -DLLVM_ROOT=$(brew --prefix llvm) \ + -DLLVM_ROOT=$(brew --prefix llvm@15) \ ../. cmake --build . \ --target install \ From 45d3f6259754e79c5af9e8362685d2b5a602c190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Fri, 28 Apr 2023 08:17:18 -0400 Subject: [PATCH 3/8] Trying to trigger the dependencies workflow by making a temporary changes in it. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- .github/workflows/dependencies_latest.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dependencies_latest.yml b/.github/workflows/dependencies_latest.yml index fe729a4fec..7ba7efe234 100644 --- a/.github/workflows/dependencies_latest.yml +++ b/.github/workflows/dependencies_latest.yml @@ -219,6 +219,9 @@ jobs: share/ci/scripts/multi/install_oiio.sh latest $EXT_PATH share/ci/scripts/multi/install_osl.sh latest $EXT_PATH share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH + - name: Print some variables + run: | + brew --prefix llvm@15 - name: Create build directories run: | mkdir _install From c69a12b65337a6125c71b7c9a121294ba3f9cf3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Fri, 28 Apr 2023 09:06:21 -0400 Subject: [PATCH 4/8] Using same version of compiler as LLVM_ROOT when building OSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- .github/workflows/dependencies_latest.yml | 2 +- share/ci/scripts/multi/install_osl.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependencies_latest.yml b/.github/workflows/dependencies_latest.yml index 7ba7efe234..cde13a8bc3 100644 --- a/.github/workflows/dependencies_latest.yml +++ b/.github/workflows/dependencies_latest.yml @@ -221,7 +221,7 @@ jobs: share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH - name: Print some variables run: | - brew --prefix llvm@15 + brew --prefix llvm - name: Create build directories run: | mkdir _install diff --git a/share/ci/scripts/multi/install_osl.sh b/share/ci/scripts/multi/install_osl.sh index f0cb450b08..7aa7f5686c 100755 --- a/share/ci/scripts/multi/install_osl.sh +++ b/share/ci/scripts/multi/install_osl.sh @@ -25,6 +25,8 @@ cd build cmake -DCMAKE_BUILD_TYPE=Release \ ${INSTALL_TARGET:+"-DCMAKE_INSTALL_PREFIX="${INSTALL_TARGET}""} \ -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_C_COMPILER=$(brew --prefix llvm@15)/bin/clang \ + -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@15)/bin/clang++ \ -DOSL_BUILD_TESTS=ON \ -DVERBOSE=ON \ -DSTOP_ON_WARNING=OFF \ From 4271acc1d0473246eb5d21a03a03f2eaa7a0757b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Fri, 28 Apr 2023 09:46:06 -0400 Subject: [PATCH 5/8] Adding LLVM_ROOT for macOS only and testing the usage of "llvm" only instead of llvm@15. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- .github/workflows/dependencies_latest.yml | 2 +- share/ci/scripts/multi/install_osl.sh | 33 +++++++++++++++-------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/dependencies_latest.yml b/.github/workflows/dependencies_latest.yml index cde13a8bc3..20998ae7b0 100644 --- a/.github/workflows/dependencies_latest.yml +++ b/.github/workflows/dependencies_latest.yml @@ -221,7 +221,7 @@ jobs: share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH - name: Print some variables run: | - brew --prefix llvm + ls -alH $(brew --prefix llvm) - name: Create build directories run: | mkdir _install diff --git a/share/ci/scripts/multi/install_osl.sh b/share/ci/scripts/multi/install_osl.sh index 7aa7f5686c..299180b510 100755 --- a/share/ci/scripts/multi/install_osl.sh +++ b/share/ci/scripts/multi/install_osl.sh @@ -22,17 +22,28 @@ mkdir build cd build # FIXME: Revert OSL_BUILD_TESTS to OFF when OSL 1.12 is released # CMake configure fails when tests are off, only fixed in 1.12 dev branch -cmake -DCMAKE_BUILD_TYPE=Release \ - ${INSTALL_TARGET:+"-DCMAKE_INSTALL_PREFIX="${INSTALL_TARGET}""} \ - -DCMAKE_CXX_STANDARD=14 \ - -DCMAKE_C_COMPILER=$(brew --prefix llvm@15)/bin/clang \ - -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@15)/bin/clang++ \ - -DOSL_BUILD_TESTS=ON \ - -DVERBOSE=ON \ - -DSTOP_ON_WARNING=OFF \ - -DBoost_NO_BOOST_CMAKE=ON \ - -DLLVM_ROOT=$(brew --prefix llvm@15) \ - ../. + +if [[ $OSTYPE == 'darwin'* ]]; then + cmake -DCMAKE_BUILD_TYPE=Release \ + ${INSTALL_TARGET:+"-DCMAKE_INSTALL_PREFIX="${INSTALL_TARGET}""} \ + -DCMAKE_CXX_STANDARD=14 \ + -DOSL_BUILD_TESTS=ON \ + -DVERBOSE=ON \ + -DSTOP_ON_WARNING=OFF \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DLLVM_ROOT=$(brew --prefix llvm) \ + ../. +else # not macOS + cmake -DCMAKE_BUILD_TYPE=Release \ + ${INSTALL_TARGET:+"-DCMAKE_INSTALL_PREFIX="${INSTALL_TARGET}""} \ + -DCMAKE_CXX_STANDARD=14 \ + -DOSL_BUILD_TESTS=ON \ + -DVERBOSE=ON \ + -DSTOP_ON_WARNING=OFF \ + -DBoost_NO_BOOST_CMAKE=ON \ + ../. +fi + cmake --build . \ --target install \ --config Release \ From a8bc6f7735fc5402917be9d50724c2504a441a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Fri, 28 Apr 2023 10:13:35 -0400 Subject: [PATCH 6/8] Changing back to llvm@15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- share/ci/scripts/multi/install_osl.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/ci/scripts/multi/install_osl.sh b/share/ci/scripts/multi/install_osl.sh index 299180b510..cf693eb64f 100755 --- a/share/ci/scripts/multi/install_osl.sh +++ b/share/ci/scripts/multi/install_osl.sh @@ -27,11 +27,13 @@ if [[ $OSTYPE == 'darwin'* ]]; then cmake -DCMAKE_BUILD_TYPE=Release \ ${INSTALL_TARGET:+"-DCMAKE_INSTALL_PREFIX="${INSTALL_TARGET}""} \ -DCMAKE_CXX_STANDARD=14 \ + -DCMAKE_C_COMPILER=$(brew --prefix llvm@15)/bin/clang \ + -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@15)/bin/clang++ \ -DOSL_BUILD_TESTS=ON \ -DVERBOSE=ON \ -DSTOP_ON_WARNING=OFF \ -DBoost_NO_BOOST_CMAKE=ON \ - -DLLVM_ROOT=$(brew --prefix llvm) \ + -DLLVM_ROOT=$(brew --prefix llvm@15) \ ../. else # not macOS cmake -DCMAKE_BUILD_TYPE=Release \ From 7ee1ea5cd345a41521abf3055f4fb0d84f4966f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Fri, 28 Apr 2023 11:12:16 -0400 Subject: [PATCH 7/8] last test to confirm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- .github/workflows/dependencies_latest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependencies_latest.yml b/.github/workflows/dependencies_latest.yml index 20998ae7b0..7ba7efe234 100644 --- a/.github/workflows/dependencies_latest.yml +++ b/.github/workflows/dependencies_latest.yml @@ -221,7 +221,7 @@ jobs: share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH - name: Print some variables run: | - ls -alH $(brew --prefix llvm) + brew --prefix llvm@15 - name: Create build directories run: | mkdir _install From 717063b7c79a34dc3ed6f2261a524ec3909cb6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9drik=20Fuoco?= Date: Fri, 28 Apr 2023 11:58:20 -0400 Subject: [PATCH 8/8] removing temporary change in dependencies_workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Cédrik Fuoco --- .github/workflows/dependencies_latest.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/dependencies_latest.yml b/.github/workflows/dependencies_latest.yml index 7ba7efe234..fe729a4fec 100644 --- a/.github/workflows/dependencies_latest.yml +++ b/.github/workflows/dependencies_latest.yml @@ -219,9 +219,6 @@ jobs: share/ci/scripts/multi/install_oiio.sh latest $EXT_PATH share/ci/scripts/multi/install_osl.sh latest $EXT_PATH share/ci/scripts/multi/install_openfx.sh latest $EXT_PATH - - name: Print some variables - run: | - brew --prefix llvm@15 - name: Create build directories run: | mkdir _install