From e5f206065e3b49046cce234e57d03df103eab301 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 28 Nov 2012 16:33:50 +0100 Subject: [PATCH] Using $TRAVIS_BRANCH again, since its now available on travis-ci.org --- tests/travis/before_script | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/travis/before_script b/tests/travis/before_script index 9e932291..a7ebb62f 100755 --- a/tests/travis/before_script +++ b/tests/travis/before_script @@ -3,13 +3,12 @@ ### USAGE: before_script BUILD_DIR=$1 -TRAVIS_BRANCH=$2 # Fetch all dependencies # TODO Replace with different composer.json variations -echo "Checking out installer@master" -git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR +echo "Checking out installer@$TRAVIS_BRANCH" +git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR echo "Checking out sqlite3@master" git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3 @@ -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