From b318bf64f4a49a45ae7b0b1695b1490d80025e82 Mon Sep 17 00:00:00 2001 From: Lucy C <12953208+elvece@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:25:39 -0600 Subject: [PATCH] fix backend builds for safe git config (#1549) --- backend/build-prod.sh | 4 ++-- system-images/compat/build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/build-prod.sh b/backend/build-prod.sh index ff2c5c7a2..4bd479eaa 100755 --- a/backend/build-prod.sh +++ b/backend/build-prod.sh @@ -27,10 +27,10 @@ if [[ "$ENVIRONMENT" =~ (^|-)dev($|-) ]]; then FLAGS="dev,$FLAGS" fi if [[ "$FLAGS" = "" ]]; then - rust-arm64-builder sh -c "(cd backend && cargo build --release)" + rust-arm64-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release)" else echo "FLAGS=$FLAGS" - rust-arm64-builder sh -c "(cd backend && cargo build --release --features $FLAGS)" + rust-arm64-builder sh -c "(git config --global --add safe.directory '*'; cd backend && cargo build --release --features $FLAGS)" fi cd backend #rust-arm64-builder aarch64-linux-gnu-strip target/aarch64-unknown-linux-gnu/release/embassyd diff --git a/system-images/compat/build.sh b/system-images/compat/build.sh index 13b289531..7e2c38c4c 100755 --- a/system-images/compat/build.sh +++ b/system-images/compat/build.sh @@ -16,5 +16,5 @@ fi alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:aarch64-musl' cd ../../.. -rust-musl-builder sh -c "(cd embassy-os/system-images/compat && cargo +beta build --release --target=aarch64-unknown-linux-musl --no-default-features)" +rust-musl-builder sh -c "(git config --global --add safe.directory '*'; cd embassy-os/system-images/compat && cargo +beta build --release --target=aarch64-unknown-linux-musl --no-default-features)" cd embassy-os/system-images/compat