From a8040bd24bd705f515852767a4d640cbb643b41c Mon Sep 17 00:00:00 2001 From: Vadim Kaushan Date: Sun, 17 Mar 2019 16:45:28 +0300 Subject: [PATCH] Check blobs in separate target --- .travis.yml | 4 ++++ ci/install.sh | 10 +++++++--- ci/script.sh | 10 ++++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 55c6227..40ae176 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,10 @@ matrix: rust: nightly if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) + - env: CHECK_BLOBS=1 + rust: stable + if: (branch = staging OR branch = trying OR branch = master) OR (type = pull_request AND branch = master) + install: - ci/install.sh diff --git a/ci/install.sh b/ci/install.sh index 153fbd4..6ceddbb 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -2,7 +2,11 @@ set -euxo pipefail -rustup target add $TARGET +if [ -n "${TARGET:-}" ]; then + rustup target add $TARGET +fi -mkdir gcc -curl -L https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2018.12.0-x86_64-linux-ubuntu14.tar.gz | tar --strip-components=1 -C gcc -xz +if [ -n "${CHECK_BLOBS:-}" ]; then + mkdir gcc + curl -L https://static.dev.sifive.com/dev-tools/riscv64-unknown-elf-gcc-8.1.0-2018.12.0-x86_64-linux-ubuntu14.tar.gz | tar --strip-components=1 -C gcc -xz +fi diff --git a/ci/script.sh b/ci/script.sh index 89f4f19..e9a7f10 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -2,12 +2,14 @@ set -euxo pipefail -cargo check --target $TARGET +if [ -n "${TARGET:-}" ]; then + cargo check --target $TARGET -if [ $TRAVIS_RUST_VERSION = nightly ]; then - cargo check --target $TARGET --features inline-asm + if [ $TRAVIS_RUST_VERSION = nightly ]; then + cargo check --target $TARGET --features inline-asm + fi fi -if [ $TARGET = x86_64-unknown-linux-gnu ]; then +if [ -n "${CHECK_BLOBS:-}" ]; then ./check-blobs.sh fi