diff options
| author |  Jorge Aparicio <jorge@japaric.io>
| 2018-08-25 15:56:32 +0200 |
|---|---|---|
| committer | Jorge Aparicio <jorge@japaric.io>
| 2018-08-25 15:56:32 +0200 |
| commit | 6b1cb44eb0504d1cd27e02fc79de0c7b86a32092 (patch) | |
| tree | 924c29114d999e0bba1390151695167bc5522a69 | |
| parent | 13512674413ccf84f1abc12c0fa9b57d6045661e (diff) | |
| download | cortex-m-6b1cb44eb0504d1cd27e02fc79de0c7b86a32092.tar.gz cortex-m-6b1cb44eb0504d1cd27e02fc79de0c7b86a32092.tar.zst cortex-m-6b1cb44eb0504d1cd27e02fc79de0c7b86a32092.zip | |
simplify CI
we no longer need to test clang because this crate never invokes a compiler /
assembler
| -rw-r--r-- | cortex-m-rt/.travis.yml | 16 | ||||
| -rw-r--r-- | cortex-m-rt/ci/script.sh | 30 |
2 files changed, 12 insertions, 34 deletions
diff --git a/cortex-m-rt/.travis.yml b/cortex-m-rt/.travis.yml index 7381b73..ff66c36 100644 --- a/cortex-m-rt/.travis.yml +++ b/cortex-m-rt/.travis.yml @@ -9,34 +9,18 @@ matrix: rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv6m-none-eabi CC=clang - rust: stable - if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv7m-none-eabi rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv7m-none-eabi CC=clang - rust: stable - if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv7em-none-eabi rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv7em-none-eabi CC=clang - rust: stable - if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv7em-none-eabihf rust: stable if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv7em-none-eabihf CC=clang - rust: stable - if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) - - env: TARGET=thumbv6m-none-eabi rust: nightly if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master) diff --git a/cortex-m-rt/ci/script.sh b/cortex-m-rt/ci/script.sh index 2e070bf..1fa3535 100644 --- a/cortex-m-rt/ci/script.sh +++ b/cortex-m-rt/ci/script.sh @@ -20,63 +20,57 @@ main() { # linking with GNU LD for ex in "${examples[@]}"; do cargo rustc --target $TARGET --example $ex -- \ - -C link-arg=-nostartfiles \ - -C link-arg=-Wl,-Tlink.x + -C linker=arm-none-eabi-ld \ + -C link-arg=-Tlink.x cargo rustc --target $TARGET --example $ex --release -- \ - -C link-arg=-nostartfiles \ - -C link-arg=-Wl,-Tlink.x + -C linker=arm-none-eabi-ld \ + -C link-arg=-Tlink.x done for ex in "${fail_examples[@]}"; do ! cargo rustc --target $TARGET --example $ex -- \ - -C link-arg=-nostartfiles \ - -C link-arg=-Wl,-Tlink.x + -C linker=arm-none-eabi-ld \ + -C link-arg=-Tlink.x ! cargo rustc --target $TARGET --example $ex --release -- \ - -C link-arg=-nostartfiles \ - -C link-arg=-Wl,-Tlink.x + -C linker=arm-none-eabi-ld \ + -C link-arg=-Tlink.x done cargo rustc --target $TARGET --example device --features device -- \ - -C link-arg=-nostartfiles \ - -C link-arg=-Wl,-Tlink.x + -C linker=arm-none-eabi-ld \ + -C link-arg=-Tlink.x cargo rustc --target $TARGET --example device --features device --release -- \ - -C link-arg=-nostartfiles \ - -C link-arg=-Wl,-Tlink.x + -C linker=arm-none-eabi-ld \ + -C link-arg=-Tlink.x # linking with rustc's LLD for ex in "${examples[@]}"; do cargo rustc --target $TARGET --example $ex -- \ -C linker=rust-lld \ - -Z linker-flavor=ld.lld \ -C link-arg=-Tlink.x cargo rustc --target $TARGET --example $ex --release -- \ -C linker=rust-lld \ - -Z linker-flavor=ld.lld \ -C link-arg=-Tlink.x done for ex in "${fail_examples[@]}"; do ! cargo rustc --target $TARGET --example $ex -- \ -C linker=rust-lld \ - -Z linker-flavor=ld.lld \ -C link-arg=-Tlink.x ! cargo rustc --target $TARGET --example $ex --release -- \ -C linker=rust-lld \ - -Z linker-flavor=ld.lld \ -C link-arg=-Tlink.x done cargo rustc --target $TARGET --example device --features device -- \ -C linker=rust-lld \ - -Z linker-flavor=ld.lld \ -C link-arg=-Tlink.x cargo rustc --target $TARGET --example device --features device --release -- \ -C linker=rust-lld \ - -Z linker-flavor=ld.lld \ -C link-arg=-Tlink.x fi } |