aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <japaricious@gmail.com> 2016-12-31 18:14:01 -0500
committerGravatar Jorge Aparicio <japaricious@gmail.com> 2016-12-31 18:14:01 -0500
commit3dbfae5010bc5dfdf1486bceeab2f12a629247c8 (patch)
tree59c96af8a64a59864e148630cbb99b000377fb0c
parent6124a042f97ec0bd42dc67a4e5af3eced220930e (diff)
downloadcortex-m-3dbfae5010bc5dfdf1486bceeab2f12a629247c8.tar.gz
cortex-m-3dbfae5010bc5dfdf1486bceeab2f12a629247c8.tar.zst
cortex-m-3dbfae5010bc5dfdf1486bceeab2f12a629247c8.zip
call `source` from "outside"
-rw-r--r--.travis.yml1
-rw-r--r--ci/install.sh9
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 7f681bb..85f2471 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ env: TARGET=x86_64-unknown-linux-gnu
install:
- sh ci/install.sh
+ - source ~/.cargo/bin
script:
- sh ci/script.sh
diff --git a/ci/install.sh b/ci/install.sh
index f409b71..c9ee9ba 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -4,10 +4,13 @@ main() {
curl https://sh.rustup.rs -sSf | \
sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION
- source ~/.cargo/env
-
curl -LSfs http://japaric.github.io/trust/install.sh | \
- sh -s -- --force --git japaric/cross --tag v0.1.2 --target $TARGET
+ sh -s -- \
+ --force \
+ --git japaric/cross \
+ --tag v0.1.2 \
+ --target $TARGET \
+ --to ~/.cargo/bin
}
# NOTE(TRAVIS_BRANCH) Travis is configured to only build *pushes* (not PRs)