Skip to content

Commit b00e03d

Browse files
authored
build: Unbreak CI on Mac by not letting it install llvm 20 (#1962)
We're not LLVM 20 compatible yet, we'll deal with that separately and not under the time pressure of a major releases that's overdue. Signed-off-by: Larry Gritz <[email protected]>
1 parent 323c1c1 commit b00e03d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ jobs:
528528
cxx_std: 17
529529
python_ver: "3.13"
530530
aclang: 14
531-
setenvs: export DO_BREW_UPDATE=1 CTEST_TEST_TIMEOUT=120
531+
setenvs: export DO_BREW_UPDATE=0 CTEST_TEST_TIMEOUT=120
532532
EXTRA_BREW_PACKAGES="openimageio"
533533
- desc: MacOS-14-ARM llvm17
534534
runner: macos-14
@@ -538,7 +538,7 @@ jobs:
538538
cxx_std: 17
539539
python_ver: "3.13"
540540
aclang: 15
541-
setenvs: export DO_BREW_UPDATE=1
541+
setenvs: export DO_BREW_UPDATE=0
542542
EXTRA_BREW_PACKAGES="openimageio"
543543
- desc: MacOS-15-ARM aclang16/C++17/py3.13
544544
runner: macos-15

src/build-scripts/install_homebrew_deps.bash

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ ls ${HOMEBREW_PREFIX}/lib/python${PYTHON_VERSION}
6969
# export PATH=${HOMEBREW_PREFIX}/opt/llvm${LLVMBREWVER}/bin:$PATH
7070
export LLVM_DIRECTORY=${HOMEBREW_PREFIX}/opt/llvm${LLVMBREWVER}
7171
export LLVM_ROOT=${HOMEBREW_PREFIX}/opt/llvm${LLVMBREWVER}
72+
export PATH=$LLVM_ROOT/bin:$PATH
73+
echo LLVM_ROOT=${LLVM_ROOT}
74+
# ls $LLVM_ROOT
7275
export PATH=${HOMEBREW_PREFIX}/opt/flex/bin:${HOMEBREW_PREFIX}/opt/bison/bin:$PATH
7376

7477
# Save the env for use by other stages

0 commit comments

Comments
 (0)