From 91987c91017c18d62b5631dead47622b141955e2 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Sun, 3 May 2015 21:42:48 -0400 Subject: [PATCH 1/4] Have travis push docs to github pages instead of rust-ci --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1bedad..7773a9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,15 @@ language: rust env: global: - - secure: Dr/AOuXnBuLZqw0ZW+KDKlCyUGUfqMv5AnuPr8mnzxL3CrWInBwoNv8bME3pY10A/u4e16+T6NhdK5AuoYvhTnDUM0srGMhHgTtV8X5yQog1U0BUIMTfQhgGOQ+/2m0yawjtm7KTZQmNCh5+c/S26fZPVcgoMpu9GZR5h7m2ep4= + secure: "FyGzHF0AIYdBcuM/2qIoABotx3MbNAlaHDzxPbbeUlVg64bnuib9G9K/qWve0a1BWCgv+8e/SbXZb7gt3JlUNE27aE4RZG4FEdtEpLYQp87Dc9d9HX0FwpUeFK3binsrtYl4WEBnIjQ3ICnUVey0E6GHEdkM+t5bWyJO5c4dJ30=" script: - cargo build - cargo test - cargo doc --no-deps -after_script: - - mv target/doc . - - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh +after_success: | + echo '' > target/doc/index.html && + sudo pip install ghp-import && + ghp-import -n target/doc && + git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages From b393348ab01da9aca7455f975bd007dab25a180e Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Sun, 3 May 2015 21:49:27 -0400 Subject: [PATCH 2/4] Remove stable `#![allow(unstable)]` tags from docs --- src/lib.rs | 1 - src/types.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 49d9248..5877d19 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,6 @@ //! an interface similar to [rust-postgres](https://github.com/sfackler/rust-postgres). //! //! ```rust -//! #![allow(unstable)] //! extern crate rusqlite; //! extern crate time; //! diff --git a/src/types.rs b/src/types.rs index 3ae570f..753cf67 100644 --- a/src/types.rs +++ b/src/types.rs @@ -140,7 +140,6 @@ impl ToSql for Option { /// ## Example /// /// ```rust,no_run -/// #![allow(unstable)] /// # extern crate libc; /// # extern crate rusqlite; /// # use rusqlite::{SqliteConnection, SqliteResult}; From dcdb88e3747cc6a41ff7e240b02119f249ac3f53 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Sun, 3 May 2015 21:50:09 -0400 Subject: [PATCH 3/4] Update README to point to github pages docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b66db27..74406a6 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Rusqlite is an ergonomic wrapper for using SQLite from Rust. It attempts to expose an interface similar to [rust-postgres](https://github.com/sfackler/rust-postgres). View the full -[API documentation](http://www.rust-ci.org/jgallagher/rusqlite/doc/rusqlite/). +[API documentation](http://jgallagher.github.io/rusqlite/rusqlite/index.html). ```rust extern crate rusqlite; From 3eb2c333db77a3d67139d4391a4f22b73e96c190 Mon Sep 17 00:00:00 2001 From: John Gallagher Date: Sun, 3 May 2015 21:50:50 -0400 Subject: [PATCH 4/4] Only publish docs from master --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7773a9b..e7cc210 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ script: - cargo doc --no-deps after_success: | + [ $TRAVIS_BRANCH = master ] && + [ $TRAVIS_PULL_REQUEST = false ] && echo '' > target/doc/index.html && sudo pip install ghp-import && ghp-import -n target/doc &&