From 74911058736b75b8cf47a5bbf375d091a4376cf7 Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Sun, 18 Nov 2018 17:37:57 +0100 Subject: [PATCH] Clone ci scripts into folder --- .travis.yml | 8 ++++---- ci/install.sh | 13 ------------- ci/script.sh | 26 -------------------------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 ci/install.sh delete mode 100644 ci/script.sh diff --git a/.travis.yml b/.travis.yml index 826c362..75aa60a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: rust sudo: required before_script: - bash <(curl -s https://github.com/eldruin/rust-driver-ci-scripts/raw/master/global_before_script.sh) + git clone https://github.com/eldruin/rust-driver-ci-scripts ci matrix: include: @@ -54,10 +54,10 @@ before_install: - rustup self update install: - bash <(curl -s https://github.com/eldruin/rust-driver-ci-scripts/raw/master/install.sh) + bash ci/install.sh script: - bash <(curl -s https://github.com/eldruin/rust-driver-ci-scripts/raw/master/script.sh) + bash ci/script.sh after_script: set +e @@ -67,7 +67,7 @@ cache: - /home/travis/.cargo before_cache: - bash <(curl -s https://github.com/eldruin/rust-driver-ci-scripts/raw/master/before_cache.sh) + bash ci/before_cache.sh branches: only: diff --git a/ci/install.sh b/ci/install.sh deleted file mode 100644 index 42c96b4..0000000 --- a/ci/install.sh +++ /dev/null @@ -1,13 +0,0 @@ -set -euxo pipefail - -main() { - rustup component add rust-src - SYSROOT=$(rustc --print sysroot) - if [[ ! "$SYSROOT" =~ "$TARGET" ]]; then - rustup target add $TARGET - else - echo "Target $TARGET is already installed" - fi -} - -main diff --git a/ci/script.sh b/ci/script.sh deleted file mode 100644 index a021a95..0000000 --- a/ci/script.sh +++ /dev/null @@ -1,26 +0,0 @@ -set -exo pipefail - -main() { - export CARGO_OPTIONS="--target $TARGET" - if [[ ! $TARGET =~ .*linux.* ]]; then - sed -i "s/linux-embedded-hal/#linux-embedded-hal/g" Cargo.toml - sed -i "s/embedded-hal-mock/#embedded-hal-mock/g" Cargo.toml - fi - - if [ ! -z $FEATURES ]; then - export CARGO_OPTIONS="$CARGO_OPTIONS --features $FEATURES" - fi - - cargo check $CARGO_OPTIONS - cargo build $CARGO_OPTIONS - if [ -z $DISABLE_EXAMPLES ] && [[ $TARGET =~ .*linux.* ]]; then - cargo build $CARGO_OPTIONS --examples - fi - cargo doc $CARGO_OPTIONS - - if [ -z $DISABLE_TESTS ] && [[ $TARGET =~ .*linux.* ]]; then - cargo test $CARGO_OPTIONS - fi -} - -main