diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2018-12-15 21:17:14 +0100 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io> | 2018-12-15 21:17:14 +0100 |
| commit | e03c09874fd557126d8ae3d21e5b90681d358ef0 (patch) | |
| tree | 69488293ab75c55308991c10ea40efaf61b891e1 | |
| parent | d14e25d72d7b182d305c0f9ee80294c697c42dee (diff) | |
ci: switch to an older nightly
to work around rust-lang/rust#56814
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | ci/script.sh | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 481f8fe..2825a15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,15 @@ matrix: if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=x86_64-unknown-linux-gnu - rust: nightly + rust: nightly-2018-12-06 if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv6m-none-eabi - rust: nightly + rust: nightly-2018-12-06 if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv7m-none-eabi - rust: nightly + rust: nightly-2018-12-06 if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) before_install: set -e diff --git a/ci/script.sh b/ci/script.sh index eb582d4..20394d5 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -5,10 +5,11 @@ main() { if [ $T = x86_64-unknown-linux-gnu ]; then # compile-fail and compile-pass tests - if [ $TRAVIS_RUST_VERSION = nightly ]; then - # TODO how to run a subset of these tests when timer-queue is disabled? - cargo test --features timer-queue --test compiletest --target $T - fi + case $TRAVIS_RUST_VERSION in + nightly*) + # TODO how to run a subset of these tests when timer-queue is disabled? + cargo test --features timer-queue --test compiletest --target $T + esac cargo check --target $T cargo check --features timer-queue --target $T |