Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Re-adding usage of $TRAVIS_BRANCH, fixing wrong 3.0 dependency

Probably caused by a merge from 3.0
  • Loading branch information...
commit 7bd200f2db0380890577cf210909221bc357a873 1 parent 09f382d
@chillu chillu authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 tests/travis/before_script
View
5 tests/travis/before_script
@@ -3,7 +3,6 @@
### USAGE: before_script <base-folder> <travis-branch>
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
Please sign in to comment.
Something went wrong with that request. Please try again.