Merge branch '2.4' into post-2.4

This commit is contained in:
Daniel Hensby 2016-03-15 17:36:20 +00:00
commit 6b9b8314c7

View File

@ -1,12 +1,30 @@
language: php language: php
php:
- 5.3 sudo: false
env: env:
- DB=MYSQL CORE_RELEASE=2.4 global:
- DB=PGSQL CORE_RELEASE=2.4 - CORE_RELEASE=2.5
- CORE_INSTALLER_RELEASE=post-2.4
- secure: "7V20Qk3bIG2AlTJaA5D/uzB8vUVvRwQp+xjRYUxlahtj9FcuqEV3HIyjwwJe0T6Z1bnRYuu28ZnCT2CfP9BBZ3FE7AwSZbPase9c0/at2qDJNqkvIdC1xZ1H6Fcy2LSwNB9wLQPe613ItVdanitEuwE41iowxBPslxUUTnwx7eY="
- secure: "f/GWlbnNri2YpCOrJfZl7tkhpMmcRVUbCdmb+beAY90gFBJQPHtljzf8M4KaCP0OkLOtRFuGoMFdIcpadl4J6IG1XP18IJNz+nKzCL/sJj/FF9y77RdMHWE9jr21G9ar5tywkn7JM6vrnTCY89OnHeQx67SKvxqX5CpVx+rdcEU="
matrix:
include:
- php: 5.3
env: DB=MYSQL
- php: 5.3
env: DB=PGSQL
- php: 5.4
env: DB=MYSQL
- php: 5.5
env: DB=MYSQL
- php: 5.6
env: DB=MYSQL
before_script: before_script:
- composer self-update || true
- phpenv rehash
- 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
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- cd ~/builds/ss - cd ~/builds/ss
@ -20,8 +38,3 @@ branches:
- 2.2 - 2.2
- 2.3 - 2.3
- translation-staging - translation-staging
notifications:
irc:
channels:
- "irc.freenode.org#silverstripe"