diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 18:14:39 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-13 18:14:39 -0500 |
| commit | 0b0b5e15c3b7fc55774df09025f6bb206f7df4bd (patch) | |
| tree | 6acfa3ec8942176337c4859e7dcf986d2e0fbc62 | |
| parent | 8b4e6619049e5bb36bd28af218f9b60834b10b99 (diff) | |
| parent | 4001410c8c80ac9c531343af28310e97b4bbf1fe (diff) | |
| download | forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar.gz forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar.bz2 forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.tar.xz forums-0b0b5e15c3b7fc55774df09025f6bb206f7df4bd.zip | |
Merge PR #1191 branch 'bantu/ticket/11324' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11324:
[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 94e7086c1e..ba8c1b4a91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,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" |