diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-30 03:19:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 03:19:43 +0000 |
| commit | f6cac16f6f9104b3cf257bdba1cc6999f2da9a69 (patch) | |
| tree | 60bcb644aa9852e097e4770d2bf3161ba4b04fa2 | |
| parent | 2c42b302ed78b8cfc45560b26f01487005c4ccd1 (diff) | |
| parent | c339ce10181509be55e32db390b1dfafb2ea5e27 (diff) | |
| download | nix-f6cac16f6f9104b3cf257bdba1cc6999f2da9a69.zip | |
Merge #1263
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.
https://github.com/nix-rust/nix/issues/1258
https://github.com/rust-embedded/cross/issues/427
Co-authored-by: Alan Somers <asomers@gmail.com>
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 12384a54..285c161c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 |