Skip to content

MacOS CI failure fix #1280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomsonTan merged 3 commits into from
May 29, 2024
Merged

MacOS CI failure fix #1280

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d64d055
use sudo for macos
lalitb May 29, 2024
2171b01
log error message if NOROOT is set
lalitb May 29, 2024
5ae26cb
make it more concise
lalitb May 29, 2024
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
10 changes: 6 additions & 4 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,15 @@ echo "macosx deployment target="$MACOSX_DEPLOYMENT_TARGET
# Install build tools and recent sqlite3
FILE=.buildtools
OS_NAME=`uname -a`

if [ ! -f $FILE ]; then
case "$OS_NAME" in
*Darwin*) tools/setup-buildtools-apple.sh $MAC_ARCH ;;
*Linux*) [[ -z "$NOROOT" ]] && sudo tools/setup-buildtools.sh || echo "No root: skipping build tools installation." ;;
*) echo "WARNING: unsupported OS $OS_NAME , skipping build tools installation.."
*Darwin*) CMD="tools/setup-buildtools-apple.sh $MAC_ARCH" ;;
*Linux*) CMD="tools/setup-buildtools.sh" ;;
*) CMD=""; echo "WARNING: unsupported OS $OS_NAME, skipping build tools installation.." ;;
esac
# Assume that the build tools have been successfully installed

[[ -n "$CMD" ]] && { [[ -z "$NOROOT" ]] && sudo $CMD || echo "No root: skipping build tools installation."; }
echo > $FILE
fi

Expand Down