Skip to content

Commit f6cac16

Browse files
bors[bot]asomers
andauthored
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. #1258 cross-rs/cross#427 Co-authored-by: Alan Somers <asomers@gmail.com>
2 parents 2c42b30 + c339ce1 commit f6cac16

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,18 @@ matrix:
9595
script:
9696
- cargo update -Zminimal-versions
9797
- cargo check
98+
99+
# Redoxer is too unreliable, so we'll do a cross-build only
100+
# See also:
101+
# https://github.com/nix-rust/nix/issues/1258
102+
# https://github.com/rust-embedded/cross/issues/427
98103
- language: generic
99104
name: redox
100105
script:
101-
- docker pull redoxos/redoxer
102-
- docker run -v $(pwd):$(pwd) -w $(pwd) redoxos/redoxer sh -c 'rm -rf ~/.redoxer && redoxer test'
106+
- curl --proto '=https' --tlsv1.2 -sSf --output rustup.sh https://sh.rustup.rs
107+
- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0 --target x86_64-unknown-redox
108+
- . $HOME/.cargo/env
109+
- cargo build --all-targets
103110

104111
before_install: set -e
105112

0 commit comments

Comments
 (0)