Merge remote-tracking branch 'origin/3.0'

This commit is contained in:
Ingo Schommer 2012-11-28 16:36:30 +01:00
commit 3512ee82f4

View File

@ -7,8 +7,8 @@ BUILD_DIR=$1
# Fetch all dependencies # Fetch all dependencies
# TODO Replace with different composer.json variations # TODO Replace with different composer.json variations
echo "Checking out installer@master" echo "Checking out installer@$TRAVIS_BRANCH"
git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR
echo "Checking out sqlite3@master" echo "Checking out sqlite3@master"
git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3 git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3