Skip to content

Commit 663691e

Browse files
committed
CI: also test on beta
1 parent 8efafdd commit 663691e

File tree

2 files changed

+37
-24
lines changed

2 files changed

+37
-24
lines changed

.travis.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
language: rust
2-
rust: nightly
32

43
addons:
54
apt:
65
packages:
76
- qemu-system-arm
87

8+
matrix:
9+
include:
10+
- rust: beta
11+
12+
matrix:
13+
include:
14+
- rust: nightly
15+
916
install:
1017
- bash ci/install.sh
1118

ci/script.sh

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -66,33 +66,39 @@ main() {
6666
edition_check
6767
popd
6868

69-
pushd app4
70-
cargo build
71-
qemu_check target/thumbv7m-none-eabi/debug/app
72-
edition_check
73-
popd
69+
# NOTE(nightly) this will require nightly until core::arch::arm::udf is stabilized
70+
if [ $TRAVIS_RUST_VERSION = nightly ]; then
71+
pushd app4
72+
cargo build
73+
qemu_check target/thumbv7m-none-eabi/debug/app
74+
edition_check
75+
popd
76+
fi
7477

7578
popd
7679

7780
# # exception handling
78-
pushd exceptions
79-
80-
# check that the disassembly matches
81-
pushd app
82-
diff app.objdump \
83-
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
84-
diff app.vector_table.objdump \
85-
<(cargo objdump --bin app --release -- -s -j .vector_table)
86-
edition_check
87-
popd
88-
89-
# check that it builds
90-
pushd app2
91-
cargo build
92-
edition_check
93-
popd
94-
95-
popd
81+
# NOTE(nightly) this will require nightly until core::arch::arm::udf is stabilized
82+
if [ $TRAVIS_RUST_VERSION = nightly ]; then
83+
pushd exceptions
84+
85+
# check that the disassembly matches
86+
pushd app
87+
diff app.objdump \
88+
<(cargo objdump --bin app --release -- -d -no-show-raw-insn -print-imm-hex)
89+
diff app.vector_table.objdump \
90+
<(cargo objdump --bin app --release -- -s -j .vector_table)
91+
edition_check
92+
popd
93+
94+
# check that it builds
95+
pushd app2
96+
cargo build
97+
edition_check
98+
popd
99+
100+
popd
101+
fi
96102
}
97103

98104
# checks that 2018 idioms are being used

0 commit comments

Comments
 (0)