Merge #275

275: fix CI r=perlindgren a=japaric

after caching was enabled binary install through the trust/install.sh script
stopped working (due to permissions?). This updates crate installation to use
`cargo-install` iff the requested version of a crate is not already installed

Co-authored-by: Jorge Aparicio <jorge@japaric.io>

1 files changed, 8 insertions, 4 deletions

diff --git a/ci/install.sh b/ci/install.sh
index aa701205..54701224 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,10 +1,16 @@
 set -euxo pipefail
 
+install_crate() {
+    local pkg=$1 vers=$2
+
+    cargo install --list | grep "$pkg v$vers" || ( cd .. && cargo install -f --vers $vers $pkg )
+}
+
 main() {
     # these are not needed for doc builds
     if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
         if [ $TARGET = x86_64-unknown-linux-gnu ]; then
-            ( cd .. && cargo install microamp-tools --version 0.1.0-alpha.3 -f )
+            install_crate microamp-tools 0.1.0-alpha.3
             rustup target add thumbv6m-none-eabi thumbv7m-none-eabi
         fi
 
@@ -17,9 +23,7 @@ main() {
         pip install linkchecker --user
     fi
 
-    # install mdbook
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- --git rust-lang-nursery/mdbook --tag v0.3.1
+    install_crate mdbook 0.3.1
 }
 
 main