diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/install.sh | 29 | ||||
| -rw-r--r-- | ci/script.sh | 9 |
2 files changed, 15 insertions, 23 deletions
diff --git a/ci/install.sh b/ci/install.sh index 748ad9a9..6e7fcc28 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,27 +1,14 @@ set -ex main() { - local target= - if [ $TRAVIS_OS_NAME = linux ]; then - target=x86_64-unknown-linux-musl - sort=sort - else - target=x86_64-apple-darwin - sort=gsort # for `sort --sort-version`, from brew's coreutils. - fi - - # This fetches latest stable release - local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ - | 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/cross \ - --tag $tag \ - --target $target + 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 + ;; + esac } main diff --git a/ci/script.sh b/ci/script.sh index 9f83f3f4..212a48ad 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -2,12 +2,17 @@ set -ex main() { if [ $TARGET = x86_64-unknown-linux-gnu ]; then + cargo build cargo test return fi - cross build --target $TARGET - cross build --target $TARGET --release + xargo build --target $TARGET + for ex in $(ls examples/*); do + ex=$(basename $ex) + ex=${ex%.*} + xargo build --target $TARGET --example $ex + done } main |