From 09863d3dfde858c95c6fd816830f23b21043ffe5 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Wed, 21 Aug 2019 10:52:52 +0100
Subject: [PATCH] Change boost init for circle-ci

---
 .circleci/config.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4bd103d6..ffff27e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ jobs:
             else
                 echo 'export BOOST_BRANCH="develop"' >> $BASH_ENV;
             fi
-            echo 'export BOOST_REMOVE="$BOOST/libs/$BOOST_LIBRARY"' >> $BASH_ENV
+            echo 'export BOOST_REMOVE="$BOOST/boost/libs/$BOOST_LIBRARY"' >> $BASH_ENV
             HOME_SED_=$(echo $HOME | sed -e 's/\//\\\//g')
             echo 'export HOME_SED=$HOME_SED_' >> $BASH_ENV
       - run:
@@ -29,33 +29,28 @@ jobs:
       - run:
           name: Initializing git repo for boost
           command: |
+            echo BOOST=$BOOST BOOST_REMOVE=$BOOST_REMOVE BOOST_LIBRARY=$BOOST_LIBRARY BOOST_BRANCH=$BOOST_BRANCH PWD=$PWD
             mkdir $BOOST
             cd $BOOST
-            echo Testing $CIRCLE_BRANCH
-            git remote add --no-tags -t $BOOST_BRANCH origin https://github.com/boostorg/boost.git
-            git fetch --depth=1
-            git checkout $BOOST_BRANCH
+            git clone --single-branch --branch $BOOST_BRANCH https://github.com/boostorg/boost.git
+            cd boost
             git submodule update --init --merge
-            git remote set-branches --add origin $BOOST_BRANCH
-            git pull --recurse-submodules
-            git submodule update --init
-            git checkout $BOOST_BRANCH
-            git submodule foreach "git reset --quiet --hard; git clean -fxd"
-            git reset --hard; git clean -fxd
-            git status
             rm -rf $BOOST_REMOVE
             mv $HOME/project $BOOST_REMOVE
       - run:
           name: Bootstrapping boost-build
           command: |
+            echo $PWD
             cd $BOOST
             ./bootstrap.sh
             ./b2 headers
       - run:
           name: Building inspect
           command: |
+            echo $PWD
             cd tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin
       - run:
           name: Running Inspect
           command: |
+            echo $PWD
             cd $BOOST_REMOVE && ../../dist/bin/inspect -text -license -copyright -crlf -end -link -path_name -tab -ascii -apple_macro -assert_macro -minmax -unnamed -version-string