Skip to content

s/Xargo/Cargo/ #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bors.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
status = [
"continuous-integration/travis-ci/push",
"continuous-integration/appveyor/branch"
]
5 changes: 1 addition & 4 deletions ci/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ set -euxo pipefail
main() {
case $TARGET in
thumbv*-none-eabi*)
cargo install --list | grep xargo || \
cargo install xargo
rustup component list | grep 'rust-src.*installed' || \
rustup component add rust-src
rustup target add $TARGET
;;
esac
}
Expand Down
6 changes: 3 additions & 3 deletions ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ set -euxo pipefail
main() {
case $TARGET in
thumbv7em-none-eabi*)
xargo check --target $TARGET --features cm7-r0p1
xargo check --target $TARGET
cargo check --target $TARGET --features cm7-r0p1
cargo check --target $TARGET
;;
thumbv*-none-eabi*)
xargo check --target $TARGET
cargo check --target $TARGET
;;
*)
cargo test --target $TARGET
Expand Down