From ed6ef4e1493dc7cf9bac9ca86398c9e38d0ef986 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Wed, 20 May 2015 22:44:50 -0700 Subject: [PATCH] Travis work --- .travis.yml | 32 ++++++++++++++++++------ {serde => serde_macros}/examples/json.rs | 0 2 files changed, 25 insertions(+), 7 deletions(-) rename {serde => serde_macros}/examples/json.rs (100%) diff --git a/.travis.yml b/.travis.yml index 619bdf61..be6b9832 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,34 @@ language: rust +rust: + - stable + - beta + - nightly +env: + global: + secure: HO41LMpMXkF2In9+1sxWVu7fgolL+y9+4Q5PI6wZX2L5pDwpPJCjxaQarQXCEnoIxED1PlP03JuF7ULNz0zw1ylYhAOfOSdkxFZRnE2wMZqq6qvXBHwyMiDrAociIzoPKSGv7JVrKPsjsnd+96K6xxueIodQZrmAdyq7N/M82Mc= + matrix: + - CRATE=serde_tests TARGET=test +matrix: + include: + - rust: nightly + env: CRATE=serde_macros TARGET=test + - rust: nightly + env: CRATE=serde_macros TARGET=bench + - rust: nightly + env: CRATE=serde_tests TARGET=bench script: -- cargo test -- cargo bench -- cargo doc + - (cd $CRATE && cargo $TARGET) after_success: | [ $TRAVIS_BRANCH = "master" ] && [ $TRAVIS_PULL_REQUEST = false ] && - cargo doc && + mkdir -p target/doc && + (cd serde && cargo doc --no-deps) && + (cd serde_codegen && cargo doc --no-deps) && + (cd serde_macros && cargo doc --no-deps) && + cp -r serde/target/doc target/doc/serde && + cp -r serde_codegen/target/doc target/doc/serde_codegen && + cp -r serde_macros/target/doc target/doc/serde_macros && 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 -env: - global: - secure: HO41LMpMXkF2In9+1sxWVu7fgolL+y9+4Q5PI6wZX2L5pDwpPJCjxaQarQXCEnoIxED1PlP03JuF7ULNz0zw1ylYhAOfOSdkxFZRnE2wMZqq6qvXBHwyMiDrAociIzoPKSGv7JVrKPsjsnd+96K6xxueIodQZrmAdyq7N/M82Mc= diff --git a/serde/examples/json.rs b/serde_macros/examples/json.rs similarity index 100% rename from serde/examples/json.rs rename to serde_macros/examples/json.rs