Skip to content

Commit

Permalink
s/Xargo/Cargo/
Browse files Browse the repository at this point in the history
  • Loading branch information
japaric committed Apr 8, 2018
1 parent c1f98db commit a4fedc0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 23 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ script:

after_script: set +e

cache:
cargo: true
directories:
- $HOME/.xargo
cache: cargo

before_cache:
# Travis can't cache files that are not readable by "others"
Expand Down
18 changes: 3 additions & 15 deletions ci/install.sh
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
set -euxo pipefail

main() {
# This fetches latest stable release of Xargo
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/xargo \
| cut -d/ -f3 \
| grep -E '^v[0.1.0-9.]+$' \
| sort --version-sort \
| tail -n1)

curl -LSfs https://japaric.github.io/trust/install.sh | \
sh -s -- \
--force \
--git japaric/xargo \
--tag $tag \
--target x86_64-unknown-linux-musl

rustup component add rust-src
if [ $TARGET = thumbv7em-none-eabihf ]; then
rustup target add $TARGET
fi
}

main
6 changes: 3 additions & 3 deletions ci/script.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
set -euxo pipefail

main() {
cargo check --target $TARGET

if [ $TARGET = x86_64-unknown-linux-gnu ]; then
bash gen-examples.sh
git diff --exit-code

cargo check --target $TARGET
return
fi

xargo check --target $TARGET
xargo check --target $TARGET --examples
cargo check --target $TARGET --examples
}

main
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
//!
//! # flash and debug the "Hello, world" example
//! $ cd f3
//! $ xargo run --example hello
//! $ rustup target add thumbv7em-none-eabihf
//! $ cargo run --example hello
//! ```
//!
//! You'll need to have both OpenOCD and arm-none-eabi-ld installed.
Expand Down

0 comments on commit a4fedc0

Please sign in to comment.