From 1e117d22a09562e6f23456f23c526b27a8916928 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 28 Mar 2013 22:36:05 +0100
Subject: [PATCH] Simplified travis builds (external setup scripts)

---
 .travis.yml                | 21 +++++++++++----------
 tests/travis/before_script | 37 -------------------------------------
 2 files changed, 11 insertions(+), 47 deletions(-)
 delete mode 100755 tests/travis/before_script

diff --git a/.travis.yml b/.travis.yml
index 5a2c56c3..0f71862c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,23 @@
 language: php 
-php: 
- - 5.3
- - 5.4
-
-env:
- - TESTDB=MYSQL
 
 matrix:
-  exclude:
+  include:
+    - php: 5.3
+      env: DB=MYSQL CORE_RELEASE=3.0
     - php: 5.4
-      env: TESTDB=PGSQL
+      env: DB=MYSQL CORE_RELEASE=3.0
+    - php: 5.3
+      env: DB=PGSQL CORE_RELEASE=3.0
+  allow_failures:
+    - env: DB=PGSQL CORE_RELEASE=3.0
 
 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 framework/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 401a8a6c..00000000
--- a/tests/travis/before_script
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-### USAGE: before_script <base-folder> <travis-branch>
-
-BUILD_DIR=$1
-
-# Environment info
-echo "# Environment info"
-echo " - `php --version`"
-echo " - `mysql --version`"
-echo " - `pg_config --version`"
-echo " - SQLite3 `sqlite3 -version`"
-echo ""
-
-# Fetch all dependencies
-# TODO Replace with different composer.json variations
-
-echo "Checking out installer@3.1"
-git clone --depth=100 --quiet -b 3.1 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
-
-echo "Checking out sapphire@3.1"
-git clone --depth=100 --quiet -b 3.1 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