Permalink
Browse files

Simplified travis builds (external setup scripts)

  • Loading branch information...
1 parent 0ebd525 commit b23c9bba824e92897438890e4b7c48c7bc7ec16c @chillu chillu committed Mar 28, 2013
Showing with 7 additions and 43 deletions.
  1. +7 −6 .travis.yml
  2. +0 −37 tests/travis/before_script
View
@@ -1,22 +1,23 @@
language: php
php:
- 5.3
- - 5.4
env:
- - TESTDB=MYSQL
+ - DB=MYSQL CORE_RELEASE=3.0
+ - DB=PGSQL CORE_RELEASE=3.0
matrix:
- exclude:
+ include:
- php: 5.4
- env: TESTDB=PGSQL
+ env: DB=MYSQL CORE_RELEASE=3.0
before_script:
- - ./tests/travis/before_script ~/builds/ss
+ - phpenv rehash
+ - ./tests/travis/travis_setup.php --target ~/builds/ss
- cd ~/builds/ss
script:
- - php framework/cli-script.php dev/tests/module/cms
+ - phpunit cms/tests/
branches:
except:
View
@@ -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.0"
-git clone --depth=100 --quiet -b 3.0 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.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

0 comments on commit b23c9bb

Please sign in to comment.