Skip to content
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

fix a few tools/ci/cibuild.sh failures on my environment (macOS 15.1.1, x86-64, xcode 16.1) #15169

Merged
merged 2 commits into from
Dec 13, 2024
Merged

fix a few tools/ci/cibuild.sh failures on my environment (macOS 15.1.1, x86-64, xcode 16.1) #15169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1881646
tools/ci/platforms/darwin.sh: Don't use PIP_USER if venv is activated
yamt Dec 12, 2024
c0b776c
tools/ci/platforms/darwin.sh: update bloaty pin
yamt Dec 12, 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
17 changes: 10 additions & 7 deletions tools/ci/platforms/darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ bloaty() {
cd "${NUTTXTOOLS}"/bloaty-src
# Due to issues with latest MacOS versions use pinned commit.
# https://github.com/google/bloaty/pull/326
git checkout 52948c107c8f81045e7f9223ec02706b19cfa882
# https://github.com/google/bloaty/pull/347
git checkout 6b78e080efcb63fa4ef9d2c1f062e3d5bf158e94
mkdir -p "${NUTTXTOOLS}"/bloaty
cmake -B build/bloaty -GNinja -D BLOATY_PREFER_SYSTEM_CAPSTONE=NO -D CMAKE_INSTALL_PREFIX="${NUTTXTOOLS}"/bloaty
cmake --build build/bloaty
Expand Down Expand Up @@ -226,12 +227,14 @@ ninja_brew() {
}

python_tools() {
# Python User Env
export PIP_USER=yes
export PYTHONUSERBASE=${NUTTXTOOLS}/pylocal
echo "export PIP_USER=yes" >> "${NUTTXTOOLS}"/env.sh
echo "export PYTHONUSERBASE=${NUTTXTOOLS}/pylocal" >> "${NUTTXTOOLS}"/env.sh
add_path "${PYTHONUSERBASE}"/bin
if [ -z "${VIRTUAL_ENV}" ]; then
# Python User Env
export PIP_USER=yes
export PYTHONUSERBASE=${NUTTXTOOLS}/pylocal
echo "export PIP_USER=yes" >> "${NUTTXTOOLS}"/env.sh
echo "export PYTHONUSERBASE=${NUTTXTOOLS}/pylocal" >> "${NUTTXTOOLS}"/env.sh
add_path "${PYTHONUSERBASE}"/bin
fi

if [ "X$osarch" == "Xarm64" ]; then
python3 -m venv --system-site-packages /opt/homebrew
Expand Down
Loading