aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-08-17 18:00:17 +0200
committerGitHub <noreply@github.com>2016-08-17 18:00:17 +0200
commitb762ab3cceecfbe50443a6bf35e2ce8c71021d49 (patch)
tree8cdcfcf8a6eb87cc6b8836b231dc466804700934
parent782390a80effe3dbf7071de137e026067b116c93 (diff)
parentfc41abb990b835ec9449d691a14d0b88579db865 (diff)
downloadwallabag-b762ab3cceecfbe50443a6bf35e2ce8c71021d49.tar.gz
wallabag-b762ab3cceecfbe50443a6bf35e2ce8c71021d49.tar.zst
wallabag-b762ab3cceecfbe50443a6bf35e2ce8c71021d49.zip
Merge pull request #2134 from wallabag/hhvm
Run tests on an uptodate HHVM
-rw-r--r--.travis.yml30
1 files changed, 23 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index a387fc13..73f9491a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ php:
22 - 7.0 22 - 7.0
23 - 7.1 23 - 7.1
24 - nightly 24 - nightly
25 - hhvm
26 25
27env: 26env:
28 - DB=mysql 27 - DB=mysql
@@ -32,13 +31,29 @@ env:
32matrix: 31matrix:
33 fast_finish: true 32 fast_finish: true
34 include: 33 include:
34 # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
35 - php: hhvm-3.12
36 sudo: required
37 dist: trusty
38 group: edge
39 env: DB=mysql
40 addons:
41 apt:
42 packages:
43 - mysql-server-5.6
44 - mysql-client-core-5.6
45 - mysql-client-5.6
46 services:
47 - mysql
48 - php: hhvm-3.12
49 sudo: required
50 dist: trusty
51 group: edge
52 env: DB=sqlite
35 - php: 7.0 53 - php: 7.0
36 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite 54 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
37 exclude:
38 - php: hhvm
39 env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
40 allow_failures: 55 allow_failures:
41 - php: hhvm 56 - php: hhvm-3.12
42 - php: nightly 57 - php: nightly
43 58
44# exclude v1 branches 59# exclude v1 branches
@@ -47,9 +62,10 @@ branches:
47 - legacy 62 - legacy
48 63
49before_script: 64before_script:
50 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; 65 - PHP=$TRAVIS_PHP_VERSION
66 - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
51 # xdebug isn't enable for PHP 7.1 67 # xdebug isn't enable for PHP 7.1
52 - if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi 68 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
53 - composer self-update --no-progress 69 - composer self-update --no-progress
54 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; 70 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
55 71