diff --git a/.travis.yml b/.travis.yml index 7fcb97d179..c4729a2555 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,4 @@ install: - source $TRAVIS_BUILD_DIR/ci/travis/install_dependency.sh script: - - sudo $TRAVIS_BUILD_DIR/ci/travis/travis_build.sh + - $TRAVIS_BUILD_DIR/ci/travis/travis_build.sh diff --git a/ci/scripts/build.sh b/ci/scripts/build.sh index 8a0178b7d8..81ab6d1608 100755 --- a/ci/scripts/build.sh +++ b/ci/scripts/build.sh @@ -16,6 +16,7 @@ BUILD_TYPE="Debug" BUILD_UNITTEST="OFF" INSTALL_PREFIX="/var/lib/milvus" FAISS_ROOT="" +PRIVILEGES="OFF" CUSTOMIZATION="OFF" # default use origin faiss BUILD_COVERAGE="OFF" USE_JFROG_CACHE="OFF" @@ -24,7 +25,7 @@ GPU_VERSION="OFF" WITH_MKL="OFF" CUDA_COMPILER=/usr/local/cuda/bin/nvcc -while getopts "o:t:b:f:gxulcjmh" arg +while getopts "o:t:b:f:pgxulcjmh" arg do case $arg in o) @@ -39,6 +40,9 @@ do f) FAISS_ROOT=$OPTARG # FAISS ROOT PATH ;; + p) + PRIVILEGES="ON" # ELEVATED PRIVILEGES + ;; g) GPU_VERSION="ON"; ;; @@ -69,6 +73,7 @@ parameter: -t: build type(default: Debug) -b: core code build directory -f: faiss root path +-p: install command with elevated privileges -g: gpu version -x: milvus customization (default: OFF) -u: building unit test options(default: OFF) @@ -79,7 +84,7 @@ parameter: -h: help usage: -./build.sh -o \${INSTALL_PREFIX} -t \${BUILD_TYPE} -b \${CORE_BUILD_DIR} -f \${FAISS_ROOT} [-g] [-x] [-u] [-l] [-c] [-j] [-m] [-h] +./build.sh -o \${INSTALL_PREFIX} -t \${BUILD_TYPE} -b \${CORE_BUILD_DIR} -f \${FAISS_ROOT} [-p] [-g] [-x] [-u] [-l] [-c] [-j] [-m] [-h] " exit 0 ;; @@ -143,4 +148,9 @@ fi # compile and build make -j8 || exit 1 -make install || exit 1 + +if [[ ${PRIVILEGES} == "ON" ]];then + sudo make install || exit 1 +else + make install || exit 1 +fi diff --git a/ci/travis/travis_build.sh b/ci/travis/travis_build.sh index 3f49750b6d..919a966ced 100755 --- a/ci/travis/travis_build.sh +++ b/ci/travis/travis_build.sh @@ -18,7 +18,7 @@ done BUILD_COMMON_FLAGS="-t ${MILVUS_BUILD_TYPE} -o ${MILVUS_INSTALL_PREFIX} -b ${MILVUS_BUILD_DIR}" if [ $only_library_mode == "yes" ]; then - ${TRAVIS_BUILD_DIR}/ci/scripts/build.sh ${BUILD_COMMON_FLAGS} -m + ${TRAVIS_BUILD_DIR}/ci/scripts/build.sh ${BUILD_COMMON_FLAGS} -m -p else - ${TRAVIS_BUILD_DIR}/ci/scripts/build.sh ${BUILD_COMMON_FLAGS} -m -u -c + ${TRAVIS_BUILD_DIR}/ci/scripts/build.sh ${BUILD_COMMON_FLAGS} -m -p -u -c fi \ No newline at end of file