diff options
| author | Master Yoda <jim_parry@bcit.ca> | 2015-03-07 01:09:48 +0100 |
|---|---|---|
| committer | Master Yoda <jim_parry@bcit.ca> | 2015-03-07 01:09:48 +0100 |
| commit | d46085b99398b08c8620fdcefd8cf0e88408147d (patch) | |
| tree | 939d3c0e26f1aaa8ead59e6a88e592f3ea9b3faa /.travis.yml | |
| parent | 7762c59b50b39f00660c820171a647ea6935a93e (diff) | |
| parent | 3b526f46f5f28bc15a3402a895538777056cc9f3 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into fix/housekeeping
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 4f560442b..258ad76f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 5.4 - 5.5 - 5.6 + - 7 - hhvm env: @@ -31,11 +32,14 @@ matrix: allow_failures: - php: 5.2 - php: hhvm + - php: 7 exclude: - php: hhvm env: DB=pgsql - php: hhvm env: DB=pdo/pgsql + - php: 7 + env: DB=mysql - php: 5.2 env: DB=sqlite - php: 5.2 |