Skip to content

Commit d0454fd

Browse files
Made travis skip cargo doc because of rust-lang/rust#65840
1 parent 9b2e5a5 commit d0454fd

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.travis.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ before_script:
1414
(travis_wait rustup component add rustfmt-preview || true) &&
1515
(travis_wait rustup component add clippy-preview || true)
1616
# install mdbook for the user guide
17-
- cargo install --debug mdbook
17+
- command -v mdbook || cargo install --debug mdbook
1818

1919
script:
2020
- |
@@ -23,17 +23,15 @@ script:
2323
cargo build &&
2424
cargo test --all &&
2525
cargo test --release --all --all-features &&
26-
cargo doc --no-deps --all &&
26+
# FIXME: enable after https://github.com/rust-lang/rust/issues/65840 is fixed
27+
# cargo doc --no-deps --all &&
2728
(test "$TRAVIS_RUST_VERSION" != nightly || cargo test --release --benches --all) &&
2829
(test "$TRAVIS_RUST_VERSION" == nightly || cargo clippy --all -- --deny clippy::all) &&
2930
(test "$TRAVIS_RUST_VERSION" == nightly || cargo fmt --all -- --check)
3031
3132
before_deploy:
3233
- mdbook build user-guide
33-
- mkdir public
34-
- cp -r target/doc public/doc
35-
- cp -r target/user-guide public/user-guide
36-
- echo '<head><meta http-equiv="refresh" content="0; URL=user-guide/index.html"/></head>' > public/index.html
34+
- cp -r target/user-guide public
3735

3836
deploy:
3937
- provider: pages

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Travis Build Status](https://api.travis-ci.org/vorner/spirit.png?branch=master)](https://travis-ci.org/vorner/spirit)
44

5-
(**[API Docs for master][docs]/[User Guide][user-guide]**)
5+
(**[User Guide](https://vorner.github.io/spirit/)**)
66

77
A helper to make creating and configuring unix daemons easier.
88

@@ -26,5 +26,3 @@ submitted for inclusion in the work by you, as defined in the Apache-2.0
2626
license, shall be dual licensed as above, without any additional terms
2727
or conditions.
2828

29-
[docs]: https://vorner.github.io/spirit/doc/spirit/index.html
30-
[user-guide]: https://vorner.github.io/spirit/user-guide/index.html

0 commit comments

Comments
 (0)