Merge branch '3.0'

.travis.yml

@@ -13,7 +13,7 @@ matrix:
       env: TESTDB=PGSQL
 
 before_script:
- - ./tests/travis/before_script ~/builds/ss 
+ - ./tests/travis/before_script ~/builds/ss
  - cd ~/builds/ss
 
 script: 

composer.json

@@ -18,7 +18,7 @@
 	"require": {
 		"php": ">=5.3.2",
 		"composer/installers": "*",
-		"silverstripe/framework": "self.version"
+		"silverstripe/framework": "3.0.*"
 	},
 	"extra": {
 		"branch-alias": {

tests/travis/before_script

@@ -1,10 +1,30 @@
+#!/bin/sh
+
+### USAGE: before_script <base-folder> <travis-branch>
+
 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 sqlite3@master"
 git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3
+
+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 -b ${TRAVIS_BRANCH:-master} git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework
+
+echo "Checking out sapphire@3.0"
+git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework
+
+# Copy setup files
 cp $BUILD_DIR/framework/tests/travis/_ss_environment.php $BUILD_DIR
 cp $BUILD_DIR/framework/tests/travis/_config.php $BUILD_DIR/mysite
+
+# Copy actual project code into build directory (checked out by travis)
 cp -r . $BUILD_DIR/cms
 
 cd $BUILD_DIR