From 38d90b0f1577ba18c896c700cf4292976da1a986 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Mon, 17 May 2021 19:27:47 -0700 Subject: [PATCH] Cleanup install_deps.sh (#7734) --- .../docker/scripts/manylinux/install_deps.sh | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh index 46691112eb..1224a9ad3e 100755 --- a/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh +++ b/tools/ci_build/github/linux/docker/scripts/manylinux/install_deps.sh @@ -58,9 +58,7 @@ mkdir -p /tmp/azcopy GetFile https://aka.ms/downloadazcopy-v10-linux /tmp/azcopy/azcopy.tar.gz tar --strip 1 -xf /tmp/azcopy/azcopy.tar.gz -C /tmp/azcopy cp /tmp/azcopy/azcopy /usr/bin -echo "Installing cmake" -GetFile https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-Linux-x86_64.tar.gz /tmp/src/cmake-3.18.2-Linux-x86_64.tar.gz -tar -zxf /tmp/src/cmake-3.18.2-Linux-x86_64.tar.gz --strip=1 -C /usr + echo "Installing Ninja" GetFile https://github.com/ninja-build/ninja/archive/v1.10.0.tar.gz /tmp/src/ninja-linux.tar.gz tar -zxf ninja-linux.tar.gz @@ -68,19 +66,10 @@ cd ninja-1.10.0 cmake -Bbuild-cmake -H. cmake --build build-cmake mv ./build-cmake/ninja /usr/bin -if [[ "$os_major_version" == "6" ]]; then - echo "Installing Node.js from source" - GetFile https://nodejs.org/dist/v12.16.3/node-v12.16.3.tar.xz /tmp/src/node-v12.16.3.tar.xz - tar -xf /tmp/src/node-v12.16.3.tar.xz - cd node-v12.16.3 - LDFLAGS=-lrt /opt/python/cp27-cp27m/bin/python configure --ninja - LDFLAGS=-lrt make -j$(getconf _NPROCESSORS_ONLN) - LDFLAGS=-lrt make install -else - echo "Installing Node.js from source" - GetFile https://nodejs.org/dist/v12.16.3/node-v12.16.3-linux-x64.tar.gz /tmp/src/node-v12.16.3-linux-x64.tar.gz - tar --strip 1 -xf /tmp/src/node-v12.16.3-linux-x64.tar.gz -C /usr -fi +echo "Installing Node.js" +GetFile https://nodejs.org/dist/v12.16.3/node-v12.16.3-linux-x64.tar.gz /tmp/src/node-v12.16.3-linux-x64.tar.gz +tar --strip 1 -xf /tmp/src/node-v12.16.3-linux-x64.tar.gz -C /usr + cd /tmp/src GetFile https://downloads.gradle-dn.com/distributions/gradle-6.3-bin.zip /tmp/src/gradle-6.3-bin.zip unzip /tmp/src/gradle-6.3-bin.zip