tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Probably caused by a merge from 3.0
This commit is contained in:
Ingo Schommer 2012-11-28 16:14:01 +01:00
parent 09f382d40d
commit 7bd200f2db
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/travis/before_script
View File

@ -3,7 +3,6 @@
### USAGE: before_script <base-folder> <travis-branch> ### USAGE: before_script <base-folder> <travis-branch>
BUILD_DIR=$1 BUILD_DIR=$1
TRAVIS_BRANCH=$2
# Fetch all dependencies # Fetch all dependencies
# TODO Replace with different composer.json variations # 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" echo "Checking out postgresql@master"
git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql
echo "Checking out sapphire@3.0" echo "Checking out sapphire@$TRAVIS_BRANCH"
git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework
# Copy setup files # Copy setup files
cp $BUILD_DIR/framework/tests/travis/_ss_environment.php $BUILD_DIR cp $BUILD_DIR/framework/tests/travis/_ss_environment.php $BUILD_DIR