From 7bd200f2db0380890577cf210909221bc357a873 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 28 Nov 2012 16:14:01 +0100 Subject: [PATCH] Re-adding usage of $TRAVIS_BRANCH, fixing wrong 3.0 dependency Probably caused by a merge from 3.0 --- tests/travis/before_script | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/travis/before_script b/tests/travis/before_script index 9e932291..8eea0774 100755 --- a/tests/travis/before_script +++ b/tests/travis/before_script @@ -3,7 +3,6 @@ ### USAGE: before_script BUILD_DIR=$1 -TRAVIS_BRANCH=$2 # Fetch all dependencies # TODO Replace with different composer.json variations @@ -17,8 +16,8 @@ git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sq echo "Checking out postgresql@master" git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql -echo "Checking out sapphire@3.0" -git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework +echo "Checking out sapphire@$TRAVIS_BRANCH" +git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework # Copy setup files cp $BUILD_DIR/framework/tests/travis/_ss_environment.php $BUILD_DIR