From 1251abd4739cf3e91443201e51c43864c0c50138 Mon Sep 17 00:00:00 2001 From: Diego Barrios Romero Date: Wed, 14 Nov 2018 19:50:08 +0100 Subject: move installing grcov to install script --- .travis.yml | 2 -- ci/install.sh | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dafcbce..11656f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,6 @@ matrix: key_url: 'http://apt.llvm.org/llvm-snapshot.gpg.key' packages: - llvm-7-dev - before_script: - - if ! [ -x "$(command -v grcov)" ]; then cargo install grcov fi - env: TARGET=x86_64-unknown-linux-musl rust: nightly diff --git a/ci/install.sh b/ci/install.sh index 42c96b4..dc065f0 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,4 +1,4 @@ -set -euxo pipefail +set -exo pipefail main() { rustup component add rust-src @@ -8,6 +8,13 @@ main() { else echo "Target $TARGET is already installed" fi + if [ ! -z $COVERAGE ]; then + if ! [ -x "$(command -v grcov)" ]; then + cargo install grcov + else + echo "grcov is already installed" + fi + fi } main -- cgit v1.2.3-54-g00ecf