From b56525ed5f72d3833b29180a6a7ece50acddf4d1 Mon Sep 17 00:00:00 2001
From: Johannes Blaschke <jpblaschke@lbl.gov>
Date: Wed, 21 Mar 2018 14:19:36 -0700
Subject: [PATCH] make sure that the .nokjekyll ends up in root

---
 .travis.yml         | 3 ++-
 build_and_deploy.sh | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4f8d4a8..044c241 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ script: bash ./build_and_deploy.sh
 
 env:
   global:
-  - COMMIT_AUTHOR_EMAIL: "atmyers@lbl.gov"
+  - COMMIT_AUTHOR_EMAIL: "jpblaschke@lbl.gov"
 
 addons:
   apt:
@@ -19,6 +19,7 @@ addons:
 
 deploy:
   provider: pages
+  target-branch: gh-pages
   local-dir: docs/build
   skip-cleanup: true
   github-token: $GITHUB_TOKEN  # Set in travis-ci.org dashboard, marked secure
diff --git a/build_and_deploy.sh b/build_and_deploy.sh
index 290b40e..7ef7368 100755
--- a/build_and_deploy.sh
+++ b/build_and_deploy.sh
@@ -30,3 +30,7 @@ cd docs
 make html
 cd build
 mv html docs_html
+
+# Sphinx is set up to treat build/html (and by mv, build/docs_html) as the
+# webroot. Hence the .nojekyll file is in the wrong place
+mv docs_html/.nojekyll .
-- 
GitLab