install ninja in advance for arm64 (#27579)

Signed-off-by: PowderLi <min.li@zilliz.com>
pull/27630/head
PowderLi 2023-10-10 22:51:32 -05:00 committed by GitHub
parent 7a65b6fb85
commit 11b521392e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 1 deletions

View File

@ -13,6 +13,8 @@ FROM ubuntu:focal-20220426
ARG TARGETARCH
RUN if [ "$TARGETARCH" = "arm64" ]; then apt-get update && apt-get install -y ninja-build; fi
RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 \
g++ gcc gdb gdbserver git make ccache libssl-dev zlib1g-dev zip unzip \
clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake python3 python3-pip \

View File

@ -1,5 +1,10 @@
ROOT_DIR=$1
ARCHITECTURE=$(uname -m)
if [[ ${ARCHITECTURE} == "aarch64" ]]; then
export VCPKG_FORCE_SYSTEM_BINARIES="arm"
fi
AZURE_CMAKE_CMD="cmake \
-DCMAKE_INSTALL_LIBDIR=${ROOT_DIR}/internal/core/output/lib \
${ROOT_DIR}/internal/core/src/storage/azure-blob-storage"

View File

@ -214,7 +214,10 @@ if [ -z "$BUILD_WITHOUT_AZURE" ]; then
fi
pushd ${AZURE_BUILD_DIR}
env bash ${ROOT_DIR}/scripts/azure_build.sh ${ROOT_DIR}
cat vcpkg-bootstrap.log # need to remove
if [ ! -e libblob-chunk-manager* ]; then
cat vcpkg-bootstrap.log
exit 1
fi
popd
SYSTEM_NAME=$(uname -s)
if [[ ${SYSTEM_NAME} == "Darwin" ]]; then