From e3914cf31a4f27fa02845bd59328afff1f7eb5b5 Mon Sep 17 00:00:00 2001
From: gnzlbg <gonzalobg88@gmail.com>
Date: Tue, 19 Feb 2019 12:12:49 +0100
Subject: [PATCH] Make the build script fail faster
---
.travis.yml | 4 +++-
ci/build.sh | 5 +----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5a5bbebf..115a516a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,9 @@ matrix:
script: sh ci/build.sh
stage: tools-and-build-and-tier1
rust: nightly
- install: true
+ install:
+ - rustup component add rust-src
+ - cargo install xargo
- name: "Build Stable Rust"
script: sh ci/build.sh
stage: tools-and-build-and-tier1
diff --git a/ci/build.sh b/ci/build.sh
index a1a6b03d..0666bf14 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -30,7 +30,7 @@ test_target() {
;;
esac
- rustup target add "${TARGET}" --toolchain "${RUST}" || true
+ rustup target add "${TARGET}" --toolchain "${RUST}"
# Test that libc builds without any default features (no libstd)
"$CARGO" "+${RUST}" build -vv $opt --no-default-features --target "${TARGET}"
@@ -198,9 +198,6 @@ x86_64-unknown-openbsd
"
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then
- rustup component add rust-src || true
- cargo install xargo || true
-
for TARGET in $RUST_LINUX_NO_CORE_TARGETS; do
RUST_LIBC_NO_CORE_BUILD=1 test_target xargo "$TARGET" 1
done
--
GitLab