diff options
| author |  Jorge Aparicio <jorge@japaric.io>
| 2017-05-30 12:02:49 -0500 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io>
| 2017-05-30 12:02:49 -0500 |
| commit | fc9e6762187941b5a0457acef6899dfacc552d53 (patch) | |
| tree | 6b5c71e85b6a4a082626df20f3086deb2c533ff6 | |
| parent | f1bdfaa082d4e1c471de0c435e72cd02d2a825dd (diff) | |
| download | cortex-m-fc9e6762187941b5a0457acef6899dfacc552d53.tar.gz cortex-m-fc9e6762187941b5a0457acef6899dfacc552d53.tar.zst cortex-m-fc9e6762187941b5a0457acef6899dfacc552d53.zip | |
update the CI stuff
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rw-r--r-- | ci/install.sh | 16 | ||||
| -rw-r--r-- | ci/script.sh | 6 |
3 files changed, 14 insertions, 25 deletions
diff --git a/.travis.yml b/.travis.yml index 721b6c7..dc66bdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,30 @@ -dist: trusty language: rust -rust: nightly-2017-03-04 -services: docker -sudo: required matrix: include: + - env: TARGET=x86_64-unknown-linux-gnu + rust: nightly - env: TARGET=thumbv6m-none-eabi + rust: nightly - env: TARGET=thumbv7m-none-eabi + rust: nightly - env: TARGET=thumbv7em-none-eabi + rust: nightly - env: TARGET=thumbv7em-none-eabihf -env: TARGET=x86_64-unknown-linux-gnu + rust: nightly + +before_install: set -e install: - sh ci/install.sh - - source ~/.cargo/env || true script: - sh ci/script.sh +after_script: set +e + cache: cargo + before_cache: - chmod -R a+r $HOME/.cargo; diff --git a/ci/install.sh b/ci/install.sh index 550a548..4c39fd3 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,21 +1,7 @@ set -ex main() { - curl https://sh.rustup.rs -sSf | \ - sh -s -- -y --default-toolchain $TRAVIS_RUST_VERSION - - local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ - | cut -d/ -f3 \ - | grep -E '^v[0-9.]+$' \ - | sort --version-sort \ - | tail -n1) - curl -LSfs http://japaric.github.io/trust/install.sh | \ - sh -s -- \ - --force \ - --git japaric/cross \ - --tag $tag \ - --target x86_64-unknown-linux-musl \ - --to ~/.cargo/bin + return } # NOTE(TRAVIS_BRANCH) Travis is configured to only build *pushes* (not PRs) diff --git a/ci/script.sh b/ci/script.sh index 82b3a1d..5b52fea 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -1,14 +1,12 @@ set -ex main() { - cargo generate-lockfile - case $TARGET in thumbv*-none-eabi*) - cross build --target $TARGET + cargo check --target $TARGET ;; *) - cross test --target $TARGET + cargo test --target $TARGET ;; esac } |