From 429ac28c4a7e4a3a1207369dda2c1b1396cc5df2 Mon Sep 17 00:00:00 2001
From: Stefan Seefeld <stefan@seefeld.name>
Date: Wed, 7 Mar 2018 11:56:20 -0500
Subject: [PATCH] Streamline CI logic.

---
 .appveyor.yml |  4 ++--
 .travis.yml   | 40 +++++++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 714a51bd..4993cdc8 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -72,9 +72,9 @@ install:
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
   - |
-     curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
+     curl -LfsS -o faber.tar.gz https://github.com/stefanseefeld/faber/archive/snapshot/2018-03-07.tar.gz
      tar xf faber.tar.gz
-     CD faber-release-0.2
+     CD faber-snapshot-2018-03-07
      python setup.py install
      CD ..
   # report the available MSVC compilers
diff --git a/.travis.yml b/.travis.yml
index cd11fd0a..af460c39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,14 +63,13 @@ before_install:
 install:
   # Install our own version of Boost (the subset we need) as the system version is
   # too old (for C++11 support).
-  - rm -rf $HOME/Boost
   - |
      set -e
-     if [ ! -d $HOME/Boost ]; then
-       echo "rebuilding Boost prerequisites"
-       wget https://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.gz/download
+     if [ ! -d $HOME/Boost/tools/boostbook ]; then
+       echo "rebuilding Boost prerequisites."
+       wget https://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.tar.gz/download
        tar xf download
-       pushd boost_1_61_0
+       pushd boost_1_66_0
        ./bootstrap.sh
        ./b2 tools/bcp
        mkdir -p $HOME/Boost
@@ -78,26 +77,33 @@ install:
        dist/bin/bcp python tools/boostbook tools/quickbook $HOME/Boost &> /dev/null
        rm -rf $HOME/Boost/boost/python*
        popd
-       # Install Faber, the build tool.
-       date=2018-03-07
-       wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
-       tar xf $date.tar.gz
-       pushd faber-snapshot-$date
-       #wget https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
-       #tar xf 0.2.tar.gz
-       #pushd faber-release-0.2
-       sudo python setup.py install
-       popd
+     else
+       echo "using cached Boost prerequisites."
      fi
+     # Install Faber, the build tool.
+     date=2018-03-07
+     wget https://github.com/stefanseefeld/faber/archive/snapshot/$date.tar.gz
+     tar xf $date.tar.gz
+     pushd faber-snapshot-$date
+     #wget https://github.com/stefanseefeld/faber/archive/release/0.2.tar.gz
+     #tar xf 0.2.tar.gz
+     #pushd faber-release-0.2
+     sudo python setup.py install
+     popd
 
 before_script:
 - sed -e "s/\$PYTHON/$PYTHON/g" .ci/faber > ~/.faber
 - $PYTHON --version
 - faber -h
+- ls -l $HOME/Boost
 
 script:
-- faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS
-- if [ "$DOC" ]; then BOOST_ROOT=$HOME/Boost faber --builddir=build doc.html; fi
+- |
+   if [ "$DOC" ]; then
+     BOOST_ROOT=$HOME/Boost faber --builddir=build doc.html
+   else
+     faber --with-boost-include=$HOME/Boost --builddir=build test.report cxx.name=$CXX cxxflags=$CXXFLAGS
+   fi
 
 after_success:
 # Upload docs only when building upstream.