diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 18:14:41 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 18:14:41 -0500 |
| commit | 56e6d0531b4d7de70be018e7c136c791fca3b945 (patch) | |
| tree | c062a6b422df21359cfc407e624de9f1bb941253 | |
| parent | 405a1a1793e7a81bdb8fa3e80f66ad4075f62c54 (diff) | |
| parent | 0b0b5e15c3b7fc55774df09025f6bb206f7df4bd (diff) | |
| download | forums-56e6d0531b4d7de70be018e7c136c791fca3b945.tar forums-56e6d0531b4d7de70be018e7c136c791fca3b945.tar.gz forums-56e6d0531b4d7de70be018e7c136c791fca3b945.tar.bz2 forums-56e6d0531b4d7de70be018e7c136c791fca3b945.tar.xz forums-56e6d0531b4d7de70be018e7c136c791fca3b945.zip | |
Merge PR #1191 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
[ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index f296f10230..d7c472cd72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,16 @@ php: - 5.3.3 - 5.3 - 5.4 + - 5.5 env: - DB=mysql - DB=postgres +matrix: + allow_failures: + - php: 5.5 + before_script: - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi" |