Skip to content

Commit

Permalink
Merge #1263
Browse files Browse the repository at this point in the history
1263: Don't run redoxer in CI r=asomers a=asomers

It's unreliable.  It frequently hangs starting the Docker image, before
Cargo gets involved.  Instead, use cargo to do a cross-build for Redox.
Do it manually, since rust-embedded/cross doesn't support Redox.

#1258
cross-rs/cross#427

Co-authored-by: Alan Somers <asomers@gmail.com>
  • Loading branch information
bors[bot] and asomers committed Jun 30, 2020
2 parents 2c42b30 + c339ce1 commit f6cac16
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions .travis.yml
Expand Up @@ -95,11 +95,18 @@ matrix:
script:
- cargo update -Zminimal-versions
- cargo check

# Redoxer is too unreliable, so we'll do a cross-build only
# See also:
# https://github.com/nix-rust/nix/issues/1258
# https://github.com/rust-embedded/cross/issues/427
- language: generic
name: redox
script:
- docker pull redoxos/redoxer
- docker run -v $(pwd):$(pwd) -w $(pwd) redoxos/redoxer sh -c 'rm -rf ~/.redoxer && redoxer test'
- curl --proto '=https' --tlsv1.2 -sSf --output rustup.sh https://sh.rustup.rs
- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 --target x86_64-unknown-redox
- . $HOME/.cargo/env
- cargo build --all-targets

before_install: set -e

Expand Down

0 comments on commit f6cac16

Please sign in to comment.