tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into 3.1

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Ingo Schommer 2013-07-05 00:22:14 +02:00
commit 2545f41bdc
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -2,26 +2,23 @@ language: php
php: php:
- 5.3 - 5.3
- 5.4
env: env:
- DB=MYSQL CORE_RELEASE=3.1 - DB=MYSQL CORE_RELEASE=3.1
- DB=PGSQL CORE_RELEASE=3.1
- DB=SQLITE3 CORE_RELEASE=3.1
- PHPCS=1 CORE_RELEASE=3.1
matrix: matrix:
exclude: include:
- php: 5.4 - php: 5.3
env: DB=PGSQL CORE_RELEASE=3.1 env: DB=PGSQL CORE_RELEASE=3.1
- php: 5.3
env: DB=SQLITE CORE_RELEASE=3.1
- php: 5.4 - php: 5.4
env: DB=SQLITE3 CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.4 - php: 5.5
env: PHPCS=1 CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
allow_failures: allow_failures:
- env: DB=PGSQL CORE_RELEASE=3.1 - php: 5.5
- env: DB=SQLITE3 CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
- env: PHPCS=1 CORE_RELEASE=3.1
before_script: before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support