From be519cb83339e92ad1d9f5cd19dbff8d896002cd Mon Sep 17 00:00:00 2001 From: klemens-morgenstern Date: Mon, 10 Oct 2016 00:26:41 +0200 Subject: [PATCH] hopefully the final travis fix --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a0309645..67fe8e2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,16 +66,16 @@ before_install: - git init $BOOST - cd $BOOST - if [ $(BRANCH_TO_TEST) = "master" ]; then - set BOOST_BRANCH=master; - else set BOOST_BRANCH=develop; fi - - git remote add --no-tags -t $(BOOST_BRANCH) origin https://github.com/boostorg/boost.git + BOOST_BRANCH=master; + else BOOST_BRANCH=develop; fi + - git remote add --no-tags -t $BOOST_BRANCH origin https://github.com/boostorg/boost.git - git fetch --depth=1 - - git checkout $(BOOST_BRANCH); + - git checkout $BOOST_BRANCH - git submodule update --init --merge - - git remote set-branches --add origin $(BOOST_BRANCH) + - git remote set-branches --add origin $BOOST_BRANCH - git pull --recurse-submodules - git submodule update --init - - git checkout $(BOOST_BRANCH) + - git checkout $BOOST_BRANCH - git submodule foreach "git reset --quiet --hard; git clean -fxd" - git reset --hard; git clean -fxd - git status