Skip to content

Commit 947036e

Browse files
committed
Travis: enable extra OSX
Enable extra OSX tests ('os' key doesn't allow list) Shorten descriptions
1 parent bce70e3 commit 947036e

File tree

1 file changed

+55
-14
lines changed

1 file changed

+55
-14
lines changed

.travis.yml

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,28 @@ sudo: false
5959
matrix:
6060
include:
6161
- rust: 1.22.0
62-
env: DESCRIPTION="pinned stable Rust release"
63-
os:
64-
- linux
65-
- osx
62+
env: DESCRIPTION="Linux, 1.22.0"
63+
os: linux
64+
script:
65+
# Differs from standard script: rand_pcg features
66+
- cargo test --lib --no-default-features
67+
# TODO: add simd_support feature:
68+
- cargo test --features=serde1,log
69+
- cargo test --examples
70+
- cargo test --manifest-path rand_core/Cargo.toml
71+
- cargo test --manifest-path rand_core/Cargo.toml --no-default-features
72+
- cargo test --manifest-path rand_isaac/Cargo.toml --features=serde1
73+
# TODO: cannot test rand_pcg due to explicit dependency on i128
74+
- cargo test --manifest-path rand_xorshift/Cargo.toml --features=serde1
75+
- cargo test --manifest-path rand_xoshiro/Cargo.toml
76+
- cargo test --manifest-path rand_chacha/Cargo.toml
77+
- cargo test --manifest-path rand_hc/Cargo.toml
78+
- cargo test --manifest-path rand_jitter/Cargo.toml
79+
- cargo test --manifest-path rand_os/Cargo.toml
80+
81+
- rust: 1.22.0
82+
env: DESCRIPTION="OSX, 1.22.0"
83+
os: osx
6684
script:
6785
# Differs from standard script: rand_pcg features
6886
- cargo test --lib --no-default-features
@@ -81,10 +99,10 @@ matrix:
8199
- cargo test --manifest-path rand_os/Cargo.toml
82100

83101
- rust: stable
84-
env: DESCRIPTION="stable Rust release, linux"
102+
env: DESCRIPTION="Linux, stable"
85103

86104
- rust: stable
87-
env: DESCRIPTION="stable Rust release, macOS, iOS (cross-compile only)"
105+
env: DESCRIPTION="OSX+iOS, stable"
88106
os: osx
89107
install:
90108
- rustup target add aarch64-apple-ios
@@ -107,13 +125,11 @@ matrix:
107125
- cargo build --target=aarch64-apple-ios
108126

109127
- rust: beta
110-
env: DESCRIPTION="beta Rust release"
128+
env: DESCRIPTION="Linux, beta"
111129

112130
- rust: nightly
113-
os:
114-
- linux
115-
- osx
116-
env: DESCRIPTION="nightly features, benchmarks, documentation"
131+
os: linux
132+
env: DESCRIPTION="Linux, nightly, docs"
117133
install:
118134
- cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
119135
- cargo deadlinks -V
@@ -140,7 +156,34 @@ matrix:
140156
- cargo doc --no-deps --all --all-features
141157
- cargo deadlinks --dir target/doc
142158
after_success:
143-
- test "$TRAVIS_OS_NAME" = "linux" && travis-cargo --only nightly doc-upload
159+
- travis-cargo --only nightly doc-upload
160+
161+
- rust: nightly
162+
os: osx
163+
env: DESCRIPTION="OSX, nightly, docs"
164+
install:
165+
- cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
166+
- cargo deadlinks -V
167+
script:
168+
# Differs from standard script: alloc feature, all features, doc build
169+
- cargo test --lib --no-default-features --features=alloc
170+
- cargo test --all-features
171+
- cargo test --benches --features=nightly
172+
- cargo test --examples
173+
- cargo test --manifest-path rand_core/Cargo.toml
174+
- cargo test --manifest-path rand_core/Cargo.toml --no-default-features --features=alloc
175+
- cargo test --manifest-path rand_isaac/Cargo.toml --features=serde1
176+
- cargo test --manifest-path rand_pcg/Cargo.toml --features=serde1
177+
- cargo test --manifest-path rand_xorshift/Cargo.toml --features=serde1
178+
- cargo test --manifest-path rand_xoshiro/Cargo.toml
179+
- cargo test --manifest-path rand_chacha/Cargo.toml
180+
- cargo test --manifest-path rand_hc/Cargo.toml
181+
- cargo test --manifest-path rand_jitter/Cargo.toml
182+
- cargo test --manifest-path rand_os/Cargo.toml
183+
# remove cached documentation, otherwise files from previous PRs can get included
184+
- rm -rf target/doc
185+
- cargo doc --no-deps --all --all-features
186+
- cargo deadlinks --dir target/doc
144187

145188
- rust: nightly
146189
env: DESCRIPTION="WASM via emscripten, stdweb and wasm-bindgen"
@@ -208,8 +251,6 @@ matrix:
208251
- source ~/.cargo/env || true
209252
script:
210253
- bash utils/ci/script.sh
211-
allow_failures:
212-
- env: TARGET=armv7-linux-androideabi
213254

214255
before_install:
215256
- set -e

0 commit comments

Comments
 (0)