From 4d3482a69884d519bf57ac22f0df1de297dc83a8 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 2 Jun 2016 16:23:53 -0700
Subject: [PATCH 1/2] Don't fail a PR if it isn't deployed

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7220d7cb..b035cab6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ install:
   - "pip install git+https://github.com/lektor/lektor#egg=Lektor"
 script:
   - "lektor build"
-  - "test \"$TRAVIS_PULL_REQUEST\" == \"false\" && test \"$TRAVIS_BRANCH\" == \"master\" && lektor deploy production"
+  - "test \"$TRAVIS_PULL_REQUEST\" == \"false\" && test \"$TRAVIS_BRANCH\" == \"master\" && lektor deploy production || exit 0"
 cache:
   directories:
     - $HOME/.cache/pip

From 10010ced770e7d8bf50a94e05f364f4931d73df4 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 2 Jun 2016 16:37:41 -0700
Subject: [PATCH 2/2] Use Travis deployment

Docs: https://docs.travis-ci.com/user/deployment/
---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b035cab6..5d96938f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,15 @@ install:
   - "pip install git+https://github.com/lektor/lektor#egg=Lektor"
 script:
   - "lektor build"
-  - "test \"$TRAVIS_PULL_REQUEST\" == \"false\" && test \"$TRAVIS_BRANCH\" == \"master\" && lektor deploy production || exit 0"
 cache:
   directories:
     - $HOME/.cache/pip
     - $HOME/.cache/lektor/builds
+deploy:
+  provider: script
+  script: lektor deploy production
+  on:
+    branch: master
 addons:
   ssh_known_hosts: flow.srv.pocoo.org