Skip to content

ci: Fix and speed up Mac CI dependency installations via homebrew#2091

Merged
lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom
lgritz:lg-macllvm
Mar 6, 2026
Merged

ci: Fix and speed up Mac CI dependency installations via homebrew#2091
lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom
lgritz:lg-macllvm

Conversation

@lgritz
Copy link
Collaborator

@lgritz lgritz commented Mar 6, 2026

  • Refactor install_homebrew_deps to match recent changes in the version of this script that OIIO uses.

  • Exclude building Qt and OpenVDB from the Intel Mac CI variant -- they seem to be hit or miss these days whether it is pre-built, and if not, makes our CI on that variant take forever. We don't need it, we test those packages on other platforms, including newer Macs.

  • Bump llvm to 18 for the troublesome Intel case.

  • If we have to build OIIO, instruct it to only auto-build required dependencies.

  • Need to make sure OSL sets the OpenImageIO_CI variable also, so that OIIO, when building, knows it's a CI run (it does some extra things to avoid trouble on the runners).

* Refactor install_homebrew_deps to match recent changes in the
  version that's part of OIIO.

* Exclude building Qt and OpenVDB from the Intel Mac CI variant --
  they seem to be hit or miss these days whether it is pre-built, and
  if not, makes our CI on that variant take forever. We don't need it,
  we test those packages on other platforms, including newer Macs.

* Bump llvm to 18 for the troublesome Intel case.

* Need to make sure OSL sets the OpenImageIO_CI variable also, so that
  OIIO, when building, knows it's a CI run.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
@lgritz
Copy link
Collaborator Author

lgritz commented Mar 6, 2026

Need this to fix CI and get a release out. Pre-emptively merging, sorry.

@lgritz lgritz merged commit 3dd1d94 into AcademySoftwareFoundation:main Mar 6, 2026
27 checks passed
lgritz added a commit to lgritz/OpenShadingLanguage that referenced this pull request Mar 6, 2026
…ademySoftwareFoundation#2091)

* Refactor install_homebrew_deps to match recent changes in the
  version that's part of OIIO.

* Exclude building Qt and OpenVDB from the Intel Mac CI variant --
  they seem to be hit or miss these days whether it is pre-built, and
  if not, makes our CI on that variant take forever. We don't need it,
  we test those packages on other platforms, including newer Macs.

* Bump llvm to 18 for the troublesome Intel case.

* Need to make sure OSL sets the OpenImageIO_CI variable also, so that
  OIIO, when building, knows it's a CI run.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
@lgritz lgritz deleted the lg-macllvm branch March 6, 2026 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant