Skip to content

Commit

Permalink
Reduce verbosity of container builds (wget output) (apache#13888)
Browse files Browse the repository at this point in the history
  • Loading branch information
larroy authored and haohuw committed Jun 23, 2019
1 parent 799c37c commit 77df97a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions ci/docker/install/ubuntu_clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set -ex

apt-get update || true
# Install clang 3.9 (the same version as in XCode 8.*) and 6.0 (latest major release)
wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
wget -qO - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main" && \
apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" && \
apt-get update && \
Expand All @@ -35,4 +35,6 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
# Use llvm's master version of run-clang-tidy.py. This version has mostly minor updates, but
# importantly will properly return a non-zero exit code when an error is reported in clang-tidy.
# Please remove the below if we install a clang version higher than 6.0.
wget https://raw.githubusercontent.com/llvm-mirror/clang-tools-extra/7654135f0cbd155c285fd2a37d87e27e4fff3071/clang-tidy/tool/run-clang-tidy.py -O /usr/lib/llvm-6.0/share/clang/run-clang-tidy.py
wget \
-qO /usr/lib/llvm-6.0/share/clang/run-clang-tidy.py\
https://raw.githubusercontent.com/llvm-mirror/clang-tools-extra/7654135f0cbd155c285fd2a37d87e27e4fff3071/clang-tidy/tool/run-clang-tidy.py
4 changes: 2 additions & 2 deletions ci/docker/install/ubuntu_julia.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function install_julia() {
# The julia version in Ubuntu repo is too old
# We download the tarball from the official link:
# https://julialang.org/downloads/
wget -O $JLBINARY https://julialang-s3.julialang.org/bin/linux/x64/$1/julia-$2-linux-x86_64.tar.gz
tar xzvf $JLBINARY -C $JULIADIR --strip 1
wget -qO $JLBINARY https://julialang-s3.julialang.org/bin/linux/x64/$1/julia-$2-linux-x86_64.tar.gz
tar xzf $JLBINARY -C $JULIADIR --strip 1
rm $JLBINARY

$JULIA -e 'using InteractiveUtils; versioninfo()'
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/install/ubuntu_llvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ echo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main\
echo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main\
>> /etc/apt/sources.list.d/llvm.list

wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
wget -qO - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
apt-get update || true
apt-get install -y --force-yes llvm-5.0
2 changes: 1 addition & 1 deletion ci/docker/install/ubuntu_mkl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -ex
apt-get update || true
# Install Intel Math Kernel Library (latest major release)
# https://software.intel.com/en-us/articles/installing-intel-free-libs-and-python-apt-repo
wget -O - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB | apt-key add - && \
wget -qO - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB | apt-key add - && \
sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list' && \
apt-get update && \
apt-get install -y intel-mkl-2019.1-053

0 comments on commit 77df97a

Please sign in to comment.