Skip to content

Commit 21a7b26

Browse files
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!
2 parents fc7f0fd + 8340f74 commit 21a7b26

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

src/ci/docker/scripts/android-ndk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ URL=https://dl.google.com/android/repository
1515
download_ndk() {
1616
mkdir -p /android/ndk
1717
cd /android/ndk
18-
curl -sO $URL/$1
18+
curl -fO $URL/$1
1919
unzip -q $1
2020
rm $1
2121
mv android-ndk-* ndk

src/ci/docker/scripts/android-sdk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ URL=https://dl.google.com/android/repository
1515
download_sdk() {
1616
mkdir -p /android/sdk
1717
cd /android/sdk
18-
curl -sO $URL/$1
18+
curl -fO $URL/$1
1919
unzip -q $1
2020
rm -rf $1
2121
}

src/ci/docker/scripts/crosstool-ng.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
set -ex
1212

1313
url="http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.22.0.tar.bz2"
14-
curl -s $url | tar xjf -
14+
curl -f $url | tar xjf -
1515
cd crosstool-ng
1616
./configure --prefix=/usr/local
1717
make -j$(nproc)

src/ci/docker/scripts/dumb-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
set -ex
1212

13-
curl -sOL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb
13+
curl -fOL https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb
1414
dpkg -i dumb-init_*.deb
1515
rm dumb-init_*.deb

src/ci/docker/scripts/emscripten-wasm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exit 1
2828
}
2929

3030
# Download last known good emscripten from WebAssembly waterfall
31-
BUILD=$(curl -sL https://storage.googleapis.com/wasm-llvm/builds/linux/lkgr.json | \
31+
BUILD=$(curl -fL https://storage.googleapis.com/wasm-llvm/builds/linux/lkgr.json | \
3232
jq '.build | tonumber')
3333
curl -sL https://storage.googleapis.com/wasm-llvm/builds/linux/$BUILD/wasm-binaries.tbz2 | \
3434
hide_output tar xvkj

src/ci/docker/scripts/emscripten.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ exit 1
2828
}
2929

3030
cd /
31-
curl -sL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
31+
curl -fL https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz | \
3232
tar -xz
3333

3434
cd /emsdk-portable

src/ci/docker/scripts/make3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
set -ex
1212

13-
curl -s https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf -
13+
curl -f https://ftp.gnu.org/gnu/make/make-3.81.tar.gz | tar xzf -
1414
cd make-3.81
1515
./configure --prefix=/usr
1616
make

src/ci/docker/scripts/sccache.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
set -ex
1212

13-
curl -so /usr/local/bin/sccache \
13+
curl -fo /usr/local/bin/sccache \
1414
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl
1515

1616
chmod +x /usr/local/bin/sccache

0 commit comments

Comments
 (0)