mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-21 19:33:16 +00:00
Rollup merge of #43314 - alexcrichton:fail-curl, r=aidanhs
travis: Switch `curl -s` to `curl -f` I seem to have been a little too tired when I fixed up the container scripts, applying the wrong flag!
This commit is contained in:
commit
21a7b26bb4
@ -15,7 +15,7 @@ URL=https://dl.google.com/android/repository
|
||||
download_ndk() {
|
||||
mkdir -p /android/ndk
|
||||
cd /android/ndk
|
||||
curl -sO $URL/$1
|
||||
curl -fO $URL/$1
|
||||
unzip -q $1
|
||||
rm $1
|
||||
mv android-ndk-* ndk
|
||||
|
@ -15,7 +15,7 @@ URL=https://dl.google.com/android/repository
|
||||
download_sdk() {
|
||||
mkdir -p /android/sdk
|
||||
cd /android/sdk
|
||||
curl -sO $URL/$1
|
||||
curl -fO $URL/$1
|
||||
unzip -q $1
|
||||
rm -rf $1
|
||||
}
|
||||
|
@ -11,7 +11,7 @@
|
||||
set -ex
|
||||
|
||||
url="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2"
|
||||
curl -s $url | tar xjf -
|
||||
curl -f $url | tar xjf -
|
||||
cd crosstool-ng
|
||||
./configure --prefix=/usr/local
|
||||
make -j$(nproc)
|
||||
|
@ -10,6 +10,6 @@
|
||||
|
||||
set -ex
|
||||
|
||||
curl -sOL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb
|
||||
curl -fOL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb
|
||||
dpkg -i dumb-init_*.deb
|
||||
rm dumb-init_*.deb
|
||||
|
@ -28,7 +28,7 @@ exit 1
|
||||
}
|
||||
|
||||
# Download last known good emscripten from WebAssembly waterfall
|
||||
BUILD=$(curl -sL https://storage.googleapis.com/wasm-llvm/builds/linux/lkgr.json | \
|
||||
BUILD=$(curl -fL https://storage.googleapis.com/wasm-llvm/builds/linux/lkgr.json | \
|
||||
jq '.build | tonumber')
|
||||
curl -sL https://storage.googleapis.com/wasm-llvm/builds/linux/$BUILD/wasm-binaries.tbz2 | \
|
||||
hide_output tar xvkj
|
||||
|
@ -28,7 +28,7 @@ exit 1
|
||||
}
|
||||
|
||||
cd /
|
||||
curl -sL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
|
||||
curl -fL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
|
||||
tar -xz
|
||||
|
||||
cd /emsdk-portable
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
curl -s https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf -
|
||||
curl -f https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf -
|
||||
cd make-3.81
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
curl -so /usr/local/bin/sccache \
|
||||
curl -fo /usr/local/bin/sccache \
|
||||
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
|
||||
|
||||
chmod +x /usr/local/bin/sccache
|
||||
|
Loading…
Reference in New Issue
Block a user