Install documentation for development branch separately.

stefanseefeld · stefanseefeld · commit 9d96b5abc8dd · 2016-10-07T12:11:37.000-04:00
diff --git a/.ci/upload_docs.sh b/.ci/upload_docs.sh
@@ -5,11 +5,19 @@ SOURCE_BRANCH="master"
 TARGET_BRANCH="gh-pages"
 
 # Pull requests and commits to other branches shouldn't try to deploy, just build to verify
-if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" != master -a "$TRAVIS_BRANCH" != develop ]; then
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] || \
+   [ "$TRAVIS_BRANCH" != master -a \
+     "$TRAVIS_BRANCH" != develop  -a \
+     "$TRAVIS_BRANCH" != travis ]; then
     echo "No docs to upload."
     exit 0
 fi
 
+if [ -z "$GH_TOKEN" ]; then
+    echo "Error: GH_TOKEN is undefined"
+    exit 1
+fi
+
 # Save some useful information
 REPO=`git config remote.origin.url`
 SHA=`git rev-parse --verify HEAD`
@@ -27,12 +35,23 @@ git remote add upstream "https://$GH_TOKEN@github.com/boostorg/python.git"
 git fetch upstream
 git reset upstream/gh-pages
 
+# Prepare version.
+if [ "$TRAVIS_BRANCH" = develop -o "$TRAVIS_BRANCH" = travis ]; then
+    mkdir -p develop/doc/
+    cp ../index.html develop/
+    cp ../doc/index.html develop/doc/
+    cp -a doc/html develop/doc/
+    git add develop/index.html
+    git add develop/doc/index.html
+    git add -A develop/doc/html
+else
+    cp ../index.html .
+    cp ../doc/index.html doc/
+    git add index.html
+    git add doc/index.html
+    git add -A doc/html
+fi
 # Commit the new version.
-cp ../index.html .
-cp ../doc/index.html doc/
-git add index.html
-git add doc/index.html
-git add -A doc/html
 git commit -m "Deploy to GitHub Pages: ${SHA}"
 
 # Now that we're all set up, we can push.
diff --git a/.travis.yml b/.travis.yml
@@ -11,23 +11,25 @@ dist: trusty
 
 language: cpp
 
-matrix:
-  include:
-  - compiler: gcc
-    env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
-  - compiler: gcc
-    env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++11
-  - compiler: gcc
-    env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++98
-  - compiler: gcc
-    env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
-  - compiler: clang
-    env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98
-  - compiler: clang
-    env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11
-  - env: PYTHON=python DOC=1
+env:
+  matrix:
+    include:
+    - compiler: gcc
+      env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++98
+    - compiler: gcc
+      env: CXX=g++ PYTHON=python CXXFLAGS=-std=c++11
+    - compiler: gcc
+      env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++98
+    - compiler: gcc
+      env: CXX=g++ PYTHON=python3 CXXFLAGS=-std=c++11
+    - compiler: clang
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++98
+    - compiler: clang
+      env: CXX=clang++ PYTHON=python3 CXXFLAGS=-std=c++11
+    - env: PYTHON=python DOC=1
   global:
-  - secure: pkZAwxzBDIVqGi+1LgZdnWjvd3cFuiTBZ2TryMWp4sy8B5EuCHoALOLwd8YreYNENJmZoZKdLXUhmMG82nLmzdWZiCvH2lavkimyHwjJYn6Qj6ayeDCwRvb6rXG6mdgNkQAhbkuDu6OJv0uvkcIU8fPom+ZLIABCPWs+gKNeOmA=
+  - secure: BRNUkxN3p8f+uYKWC3Hr0VPqZA0PxbWr1DJlcI4hbiZtzKhMCWjDmd9UW9CzzexqeOxpd+9s0G87qvOur+wMSVxugDxtTesZrh1czXHeSVxgQrYD783XJtQJ9aYypbChkiboRD6Xpmbq7itwMuHBJMFtCuDxMynpU1jWwkyTf2Y=
+
 
 addons:
   apt:
@@ -85,8 +87,8 @@ script:
 after_success:
 # Upload docs only when building upstream.
 - |
-   if [ "$DOC" -a
-        "$TRAVIS_REPO_SLUG" = "boostorg/python" -a
+   if [ "$DOC" -a \
+        "$TRAVIS_REPO_SLUG" = "boostorg/python" -a \
         "$TRAVIS_PULL_REQUEST" = "false" ]; then
      export GH_TOKEN
      .ci/upload_docs.sh
diff --git a/index.html b/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <meta http-equiv="refresh" content="0; URL=doc/index.html">
+  </head>
+  <body>
+    Automatic redirection failed, click this
+    <a href="doc/index.html">link</a> &nbsp;<hr>
+    <p>� Copyright Stefan Seefeld, 2015</p>
+    <p>Distributed under the Boost Software License, Version 1.0. (See accompanying
+    file <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)</p>
+  </body>
+</html>
