diff options
| -rw-r--r-- | cortex-m-rt/.travis.yml | 41 | ||||
| -rw-r--r-- | cortex-m-rt/ci/script.sh | 2 |
2 files changed, 21 insertions, 22 deletions
diff --git a/cortex-m-rt/.travis.yml b/cortex-m-rt/.travis.yml index fd45f63..ac2bfa2 100644 --- a/cortex-m-rt/.travis.yml +++ b/cortex-m-rt/.travis.yml @@ -3,29 +3,28 @@ language: rust matrix: include: - env: TARGET=x86_64-unknown-linux-gnu - # TODO switch to 1.30-beta - rust: nightly + rust: beta + if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) + + - env: TARGET=thumbv6m-none-eabi + rust: beta + if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) + + - env: TARGET=thumbv7m-none-eabi + rust: beta + if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) + + - env: TARGET=thumbv7em-none-eabi + rust: beta + if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) + + - env: TARGET=thumbv7em-none-eabihf + rust: beta if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - # TODO enable when 1.30-beta is out - # - env: TARGET=thumbv6m-none-eabi - # rust: beta - # if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - # TODO enable when 1.30-beta is out - # - env: TARGET=thumbv7m-none-eabi - # rust: beta - # if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - # TODO enable when 1.30-beta is out - # - env: TARGET=thumbv7em-none-eabi - # rust: beta - # if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - # TODO enable when 1.30-beta is out - # - env: TARGET=thumbv7em-none-eabihf - # rust: beta - # if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) + - env: TARGET=x86_64-unknown-linux-gnu + rust: nightly + if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - env: TARGET=thumbv6m-none-eabi rust: nightly diff --git a/cortex-m-rt/ci/script.sh b/cortex-m-rt/ci/script.sh index 9933372..9911623 100644 --- a/cortex-m-rt/ci/script.sh +++ b/cortex-m-rt/ci/script.sh @@ -5,7 +5,7 @@ main() { cargo check --target $TARGET --features device - if [ $TARGET = x86_64-unknown-linux-gnu ]; then + if [ $TARGET = x86_64-unknown-linux-gnu ] && [ $TRAVIS_RUST_VERSION = nightly ]; then ( cd macros && cargo check && cargo test ) cargo test --test compiletest |