Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions .github/actions/macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ runs:
brew update
OK=0
for i in 1 2 3; do
if brew install protobuf llvm; then OK=1; break; fi
# protobuf only. Homebrew LLVM has no bottle on macos-15-intel and
# compiles from source for an hour-plus; bindgen can use Xcode's
# libclang (see LIBCLANG_PATH below).
if brew install protobuf; then OK=1; break; fi
echo "brew install attempt $i failed (often transient ghcr.io), retrying in 15s..."
sleep 15
done
if [ "$OK" -ne 1 ]; then echo "::error::brew install protobuf llvm failed after 3 attempts"; exit 1; fi
if [ "$OK" -ne 1 ]; then echo "::error::brew install protobuf failed after 3 attempts"; exit 1; fi
curl https://sh.rustup.rs -sSf | sh -s -- -y
brew uninstall cmake
set +e
Expand All @@ -33,11 +36,14 @@ runs:
shell: bash
- name: Set LIBCLANG_PATH for clang-sys (bindgen/rocksdb etc.)
run: |
# Homebrew LLVM provides libclang.dylib; clang-sys looks for libclang.dylib.
# ARM (Apple Silicon): /opt/homebrew/opt/llvm/lib
# x86 (Intel): /usr/local/opt/llvm/lib
# Prefer Xcode libclang so we never brew-build LLVM. Homebrew paths
# remain as fallbacks if someone already installed the formula.
DIR=
if command -v brew >/dev/null 2>&1; then
XC="$(xcode-select -p 2>/dev/null)/Toolchains/XcodeDefault.xctoolchain/usr/lib"
if [ -d "$XC" ] && ls "$XC"/libclang*.dylib 1>/dev/null 2>&1; then
DIR="$XC"
fi
if [ -z "$DIR" ] && command -v brew >/dev/null 2>&1; then
PREFIX="$(brew --prefix llvm 2>/dev/null)"
[ -n "$PREFIX" ] && [ -d "$PREFIX/lib" ] && ls "$PREFIX/lib"/libclang*.dylib 1>/dev/null 2>&1 && DIR="$PREFIX/lib"
fi
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/create-release-tag-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,6 @@ jobs:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest
archive: tar.gz
- target: x86_64-apple-darwin
os: macos-15-intel
archive: tar.gz
- target: aarch64-apple-darwin
os: macos-latest
archive: tar.gz
Expand Down