hackclub/burrow
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions

Use active rustup toolchain in Apple build
Some checks failed
Build Rust / Cargo Test (push) Waiting to run
Details
Build Site / Next.js Build (push) Waiting to run
Details
Build Apple / Build App (iOS Simulator) (push) Failing after 57s
Details
Build Apple / Build App (macOS) (push) Failing after 1m55s
Details

Browse source
This commit is contained in:
Conrad Kramer 2026-03-19 03:27:14 -07:00
parent f7193728df
commit 9fcaf137ac
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Apple/NetworkExtension/libburrow/build-rust.sh
View file

@ -62,10 +62,19 @@ else
CARGO_TARGET_SUBDIR="release" CARGO_TARGET_SUBDIR="release"
fi fi
RUSTUP_TOOLCHAIN=""
if [[ -x "$(command -v rustup)" ]]; then if [[ -x "$(command -v rustup)" ]]; then
CARGO_PATH="$(dirname $(rustup which cargo)):/usr/bin" RUSTUP_TOOLCHAIN="$(rustup show active-toolchain | awk '{print $1}')"
if [[ -z "${RUSTUP_TOOLCHAIN}" ]]; then
echo 'error: Unable to determine active rustup toolchain'
exit 1
fi
CARGO_BIN="$(rustup which --toolchain "${RUSTUP_TOOLCHAIN}" cargo)"
RUSTC_BIN="$(rustup which --toolchain "${RUSTUP_TOOLCHAIN}" rustc)"
CARGO_PATH="$(dirname "${CARGO_BIN}"):$(dirname "${RUSTC_BIN}"):/usr/bin"
else else
CARGO_PATH="$(dirname $(readlink -f $(which cargo))):/usr/bin" CARGO_BIN="$(command -v cargo)"
CARGO_PATH="$(dirname "${CARGO_BIN}"):/usr/bin"
fi fi
PROTOC=$(readlink -f $(which protoc)) PROTOC=$(readlink -f $(which protoc))
@ -82,7 +91,7 @@ fi
if [[ -x "$(command -v rustup)" ]]; then if [[ -x "$(command -v rustup)" ]]; then
for TARGET in "${RUST_TARGETS[@]}"; do for TARGET in "${RUST_TARGETS[@]}"; do
if ! rustup target list --installed | grep -qx "${TARGET}"; then if ! rustup target list --installed | grep -qx "${TARGET}"; then
rustup target add "${TARGET}" rustup target add --toolchain "${RUSTUP_TOOLCHAIN}" "${TARGET}"
fi fi
done done
fi fi
@ -102,13 +111,16 @@ BUILD_ENV=(
"CARGO_TARGET_DIR=${EFFECTIVE_CARGO_TARGET_DIR}" "CARGO_TARGET_DIR=${EFFECTIVE_CARGO_TARGET_DIR}"
"${EXTRA_ENV[@]}" "${EXTRA_ENV[@]}"
) )
if [[ -n "${RUSTUP_TOOLCHAIN}" ]]; then
BUILD_ENV+=("RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN}")
fi
if [[ -n "${IPHONEOS_DEPLOYMENT_TARGET:-}" ]]; then if [[ -n "${IPHONEOS_DEPLOYMENT_TARGET:-}" ]]; then
BUILD_ENV+=("IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET}") BUILD_ENV+=("IPHONEOS_DEPLOYMENT_TARGET=${IPHONEOS_DEPLOYMENT_TARGET}")
fi fi
if [[ -n "${MACOSX_DEPLOYMENT_TARGET:-}" ]]; then if [[ -n "${MACOSX_DEPLOYMENT_TARGET:-}" ]]; then
BUILD_ENV+=("MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}") BUILD_ENV+=("MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}")
fi fi
env -i "${BUILD_ENV[@]}" cargo build "${CARGO_ARGS[@]}" env -i "${BUILD_ENV[@]}" "${CARGO_BIN}" build "${CARGO_ARGS[@]}"
mkdir -p "${BUILT_PRODUCTS_DIR}" mkdir -p "${BUILT_PRODUCTS_DIR}"