Skip to content

Travis: disable Android, enable extra OSX #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
target
Cargo.lock
rand_wasm_bindgen_test*.[tj]s
rand_wasm_bindgen_test*.wasm
69 changes: 55 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,28 @@ sudo: false
matrix:
include:
- rust: 1.22.0
env: DESCRIPTION="pinned stable Rust release"
os:
- linux
- osx
env: DESCRIPTION="Linux, 1.22.0"
os: linux
script:
# Differs from standard script: rand_pcg features
- cargo test --lib --no-default-features
# TODO: add simd_support feature:
- cargo test --features=serde1,log
- cargo test --examples
- cargo test --manifest-path rand_core/Cargo.toml
- cargo test --manifest-path rand_core/Cargo.toml --no-default-features
- cargo test --manifest-path rand_isaac/Cargo.toml --features=serde1
# TODO: cannot test rand_pcg due to explicit dependency on i128
- cargo test --manifest-path rand_xorshift/Cargo.toml --features=serde1
- cargo test --manifest-path rand_xoshiro/Cargo.toml
- cargo test --manifest-path rand_chacha/Cargo.toml
- cargo test --manifest-path rand_hc/Cargo.toml
- cargo test --manifest-path rand_jitter/Cargo.toml
- cargo test --manifest-path rand_os/Cargo.toml

- rust: 1.22.0
env: DESCRIPTION="OSX, 1.22.0"
os: osx
script:
# Differs from standard script: rand_pcg features
- cargo test --lib --no-default-features
Expand All @@ -81,10 +99,10 @@ matrix:
- cargo test --manifest-path rand_os/Cargo.toml

- rust: stable
env: DESCRIPTION="stable Rust release, linux"
env: DESCRIPTION="Linux, stable"

- rust: stable
env: DESCRIPTION="stable Rust release, macOS, iOS (cross-compile only)"
env: DESCRIPTION="OSX+iOS, stable"
os: osx
install:
- rustup target add aarch64-apple-ios
Expand All @@ -107,13 +125,11 @@ matrix:
- cargo build --target=aarch64-apple-ios

- rust: beta
env: DESCRIPTION="beta Rust release"
env: DESCRIPTION="Linux, beta"

- rust: nightly
os:
- linux
- osx
env: DESCRIPTION="nightly features, benchmarks, documentation"
os: linux
env: DESCRIPTION="Linux, nightly, docs"
install:
- cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
- cargo deadlinks -V
Expand All @@ -140,7 +156,34 @@ matrix:
- cargo doc --no-deps --all --all-features
- cargo deadlinks --dir target/doc
after_success:
- test "$TRAVIS_OS_NAME" = "linux" && travis-cargo --only nightly doc-upload
- travis-cargo --only nightly doc-upload

- rust: nightly
os: osx
env: DESCRIPTION="OSX, nightly, docs"
install:
- cargo --list | egrep "^\s*deadlinks$" -q || cargo install cargo-deadlinks
- cargo deadlinks -V
script:
# Differs from standard script: alloc feature, all features, doc build
- cargo test --lib --no-default-features --features=alloc
- cargo test --all-features
- cargo test --benches --features=nightly
- cargo test --examples
- cargo test --manifest-path rand_core/Cargo.toml
- cargo test --manifest-path rand_core/Cargo.toml --no-default-features --features=alloc
- cargo test --manifest-path rand_isaac/Cargo.toml --features=serde1
- cargo test --manifest-path rand_pcg/Cargo.toml --features=serde1
- cargo test --manifest-path rand_xorshift/Cargo.toml --features=serde1
- cargo test --manifest-path rand_xoshiro/Cargo.toml
- cargo test --manifest-path rand_chacha/Cargo.toml
- cargo test --manifest-path rand_hc/Cargo.toml
- cargo test --manifest-path rand_jitter/Cargo.toml
- cargo test --manifest-path rand_os/Cargo.toml
# remove cached documentation, otherwise files from previous PRs can get included
- rm -rf target/doc
- cargo doc --no-deps --all --all-features
- cargo deadlinks --dir target/doc

- rust: nightly
env: DESCRIPTION="WASM via emscripten, stdweb and wasm-bindgen"
Expand Down Expand Up @@ -208,8 +251,6 @@ matrix:
- source ~/.cargo/env || true
script:
- bash utils/ci/script.sh
allow_failures:
- env: TARGET=armv7-linux-androideabi

before_install:
- set -e
Expand Down
5 changes: 5 additions & 0 deletions rand_os/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [0.1.3] - 2019-03-05
### Changes
- Fix support for Illumos (#730)
- Fix deprecation warnings from atomic init (#739)

## [0.1.2] - 2019-01-28
### Changes
- Fuchsia: Replaced fuchsia-zircon with fuchsia-cprng
Expand Down
2 changes: 1 addition & 1 deletion rand_os/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rand_os"
version = "0.1.2"
version = "0.1.3"
authors = ["The Rand Project Developers"]
license = "MIT/Apache-2.0"
readme = "README.md"
Expand Down