From f212ebe0f05945992585fcfd268b671f0be9e588 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 28 Mar 2013 21:07:47 +0100
Subject: [PATCH 1/2] Simplified travis builds (external setup scripts)

---
 .travis.yml                |  9 +++++----
 tests/travis/before_script | 10 ----------
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100755 tests/travis/before_script

diff --git a/.travis.yml b/.travis.yml
index 000cc5fd..4207d749 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,15 +3,16 @@ php:
  - 5.3
 
 env:
- - TESTDB=MYSQL
- - TESTDB=PGSQL
+ - DB=MYSQL CORE_RELEASE=2.4
+ - DB=PGSQL CORE_RELEASE=2.4
 
 before_script:
- - ./tests/travis/before_script ~/builds/ss 
+ - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+ - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
  - cd ~/builds/ss
 
 script: 
- - php sapphire/cli-script.php dev/tests/module/cms
+ - phpunit cms/tests
 
 branches:
   except:
diff --git a/tests/travis/before_script b/tests/travis/before_script
deleted file mode 100755
index ac9a6f0c..00000000
--- a/tests/travis/before_script
+++ /dev/null
@@ -1,10 +0,0 @@
-BUILD_DIR=$1
-git clone --depth=100 --branch 2.4 --quiet git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR
-git clone --depth=100 --branch 1.2 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3
-git clone --depth=100 --branch 1.0 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql
-git clone --depth=100 --quiet --branch 2.4 git://github.com/silverstripe/sapphire.git $BUILD_DIR/sapphire
-cp $BUILD_DIR/sapphire/tests/travis/_ss_environment.php $BUILD_DIR
-cp $BUILD_DIR/sapphire/tests/travis/_config.php $BUILD_DIR/mysite
-cp -r . $BUILD_DIR/cms
-
-cd $BUILD_DIR

From f8cfb5afd62404856623e886863b3b9d69435592 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <me@chillu.com>
Date: Tue, 30 Apr 2013 19:09:16 +0300
Subject: [PATCH 2/2] composer/installers dep workaround

Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 12e1d781..5d3a6916 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
 	],
 	"require": {
 		"php": ">=5.2.4",
-		"composer/installers": "*",
-		"silverstripe/framework": "2.4.*"
+		"silverstripe/framework": "2.4.*",
+		"composer/installers": "*"
 	}
-}
\ No newline at end of file
+}