From 0788a15a39599dece96ba5d2f8cb15c7e397939a Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 20 Jul 2017 23:03:45 -0500
Subject: update CI

---
 ci/install.sh | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'ci/install.sh')

diff --git a/ci/install.sh b/ci/install.sh
index 748ad9a..6e7fcc2 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,27 +1,14 @@
 set -ex
 
 main() {
-    local target=
-    if [ $TRAVIS_OS_NAME = linux ]; then
-        target=x86_64-unknown-linux-musl
-        sort=sort
-    else
-        target=x86_64-apple-darwin
-        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
-    fi
-
-    # This fetches latest stable release
-    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
-                       | cut -d/ -f3 \
-                       | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
-                       | tail -n1)
-    curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- \
-           --force \
-           --git japaric/cross \
-           --tag $tag \
-           --target $target
+    case $TARGET in
+        thumbv*-none-eabi*)
+            cargo install --list | grep xargo || \
+                cargo install xargo
+            rustup component list | grep 'rust-src.*installed' || \
+                rustup component add rust-src
+            ;;
+    esac
 }
 
 main
-- 
cgit v1.2.3