From 58d9b7a00e72b2aaacead203e58ca167b4c194f7 Mon Sep 17 00:00:00 2001
From: Mathijs van de Nes <git@mathijs.vd-nes.nl>
Date: Wed, 8 Apr 2015 14:55:16 +0200
Subject: [PATCH] Let Travis test both beta and nightly

---
 .travis.yml            | 30 +++++++++++++++++-------------
 .travis/publish_doc.sh |  3 ++-
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83e23d26..1368865c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,25 @@
 language: rust
 
-notifications:
-  email:
-    on_success: never
-    on_failure: always
-
-env:
-  global:
-  - secure: "VeXvD0tLJyu38t87p8AAztSQVBxsCE1y016l/Nc44203V/RUxj4tz5ifaZcKziPqFHK2ITs2T6fBE1uu404zMVwA0W0J8vmG6+xDoJJLsbwKp4W3SlAI+oIEmFSTIxgzAB7hio17VPDmAqKbnbhbmbP+U94ygoztRNN3ObCZ8yo="
+rust:
+    - 1.0.0-beta
+    - nightly
 
 sudo: false
 
+notifications:
+    email:
+        on_success: never
+        on_failure: always
+
+env:
+    global:
+        - secure: "VeXvD0tLJyu38t87p8AAztSQVBxsCE1y016l/Nc44203V/RUxj4tz5ifaZcKziPqFHK2ITs2T6fBE1uu404zMVwA0W0J8vmG6+xDoJJLsbwKp4W3SlAI+oIEmFSTIxgzAB7hio17VPDmAqKbnbhbmbP+U94ygoztRNN3ObCZ8yo="
+
 script:
-- cargo build
-- cargo test
-- cargo doc --no-deps
-- rustdoc --test README.md -L target
+    - cargo build
+    - cargo test
+    - cargo doc --no-deps
+    - rustdoc --test README.md -L target
 
 after_success:
-- .travis/publish_doc.sh
+    - .travis/publish_doc.sh
diff --git a/.travis/publish_doc.sh b/.travis/publish_doc.sh
index b7462d66..541abed5 100755
--- a/.travis/publish_doc.sh
+++ b/.travis/publish_doc.sh
@@ -2,7 +2,8 @@
 
 if  [ "$TRAVIS_BRANCH" = "master" ] &&
     [ "$TRAVIS_PULL_REQUEST" = "false" ] &&
-    [ "$TRAVIS_REPO_SLUG" = "mvdnes/zip-rs" ]
+    [ "$TRAVIS_REPO_SLUG" = "mvdnes/zip-rs" ] &&
+    [ "$TRAVIS_RUST_VERSION" = "1.0.0-beta" ]
 then
     echo "Publishing documentation..."