From a7674aa4281d66bd9b59ec1f203c97a0a2b0e3f5 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Sat, 9 Feb 2019 11:42:52 +0100 Subject: [PATCH 1/3] Do not allow rustup to fail --- .travis.yml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4be7e2ec..ac111e2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,82 +34,98 @@ matrix: script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: stable + install: true - name: "Build Beta Rust" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: beta + install: true - name: "Build Nightly Rust" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: nightly + install: true - name: "Build Stable Rust" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: stable os: osx osx_image: xcode10 + install: true - name: "Build Beta Rust" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: beta os: osx osx_image: xcode10 + install: true - name: "Build Nightly Rust" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: nightly os: osx osx_image: xcode10 + install: true - name: "Build Stable Rust 1.13.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.13.0 + install: true - name: "Build Stable Rust 1.19.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.19.0 + install: true - name: "Build Stable Rust 1.24.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.24.0 + install: true - name: "Build Stable Rust 1.25.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.25.0 + install: true - name: "Build Stable Rust 1.30.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.30.0 + install: true - name: "Build Stable Rust 1.13.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.13.0 os: osx osx_image: xcode10 + install: true - name: "Build Stable Rust 1.19.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.19.0 os: osx osx_image: xcode10 + install: true - name: "Build Stable Rust 1.24.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.24.0 os: osx osx_image: xcode10 + install: true - name: "Build Stable Rust 1.25.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.25.0 os: osx osx_image: xcode10 + install: true - name: "Build Stable Rust 1.30.0" script: sh ci/build.sh stage: tools-and-build-and-tier1 rust: 1.30.0 os: osx osx_image: xcode10 + install: true - env: TARGET=i686-apple-darwin os: osx osx_image: xcode10 @@ -119,9 +135,11 @@ matrix: - env: TARGET=x86_64-apple-darwin os: osx osx_image: xcode10 + install: true stage: tools-and-build-and-tier1 - env: TARGET=x86_64-unknown-linux-gnu stage: tools-and-build-and-tier1 + install: true # Tier 2 targets - env: TARGET=aarch64-linux-android @@ -174,7 +192,7 @@ matrix: - env: TARGET=asmjs-unknown-emscripten - env: TARGET=wasm32-unknown-emscripten -install: rustup target add $TARGET || true +install: rustup target add $TARGET script: - cargo generate-lockfile --manifest-path libc-test/Cargo.toml From d42ef14ebae108598cca38f727c718a179155818 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Sat, 9 Feb 2019 17:54:52 +0100 Subject: [PATCH 2/3] Retry rustup target add 3 times --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac111e2c..9395877a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -192,7 +192,7 @@ matrix: - env: TARGET=asmjs-unknown-emscripten - env: TARGET=wasm32-unknown-emscripten -install: rustup target add $TARGET +install: travis_retry rustup target add $TARGET script: - cargo generate-lockfile --manifest-path libc-test/Cargo.toml From 4a56c47a173d6f3df31661c15efb49c6faefa261 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Sat, 9 Feb 2019 18:22:35 +0100 Subject: [PATCH 3/3] Increase the number of retries for curl --- ci/android-install-ndk.sh | 2 +- ci/android-install-sdk.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh index ce11d006..54f7b2ef 100644 --- a/ci/android-install-ndk.sh +++ b/ci/android-install-ndk.sh @@ -11,7 +11,7 @@ set -ex -curl --retry 5 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip +curl --retry 10 -O https://dl.google.com/android/repository/android-ndk-r15b-linux-x86_64.zip unzip -q android-ndk-r15b-linux-x86_64.zip case "$1" in diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh index 6b5ac09a..64cfbf11 100644 --- a/ci/android-install-sdk.sh +++ b/ci/android-install-sdk.sh @@ -19,7 +19,7 @@ set -ex # which apparently magically accepts the licenses. mkdir sdk -curl --retry 5 https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O +curl --retry 10 https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O unzip -d sdk sdk-tools-linux-3859397.zip case "$1" in