aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--ci/script.sh9
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