Browse code

fix travis build matrix to support 7.x and hhvm

Rob Frawley 2nd authored on 18/12/2016 16:50:38 • Fabien Potencier committed on 21/12/2016 09:34:59
Showing 2 changed files
... ...
@@ -3,36 +3,37 @@ language: php
3 3
 sudo: false
4 4
 
5 5
 cache:
6
-    directories:
7
-        - vendor
8
-        - $HOME/.composer/cache/files
6
+  directories:
7
+    - vendor
8
+    - $HOME/.composer/cache/files
9 9
 
10
-php:
11
-    - 5.6
12
-    - 7.0
13
-    - 7.1
14
-    - hhvm
15
-
16
-env:
17
-    - TWIG_EXT=no
18
-    - TWIG_EXT=yes
10
+matrix:
11
+  include:
12
+    - php: hhvm-stable
13
+      sudo: required
14
+      dist: trusty
15
+      group: edge
16
+      env: TWIG_EXT=no
17
+    - php: 7.0
18
+      env: TWIG_EXT=no
19
+    - php: 7.1
20
+      env: TWIG_EXT=no
21
+  allow_failures:
22
+    - php: hhvm-stable
23
+      sudo: required
24
+      dist: trusty
25
+      group: edge
26
+      env: TWIG_EXT=no
27
+  fast_finish: true
19 28
 
20 29
 before_install:
21
-    - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
30
+  - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
31
+  - if [[ $TRAVIS_PHP_VERSION = hhvm* ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
22 32
 
23 33
 install:
24 34
   - travis_retry composer install
25 35
 
26 36
 before_script:
27
-    - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
28
-    - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
37
+  - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
38
+  - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
29 39
 
30
-matrix:
31
-    fast_finish: true
32
-    exclude:
33
-        - php: hhvm
34
-          env: TWIG_EXT=yes
35
-        - php: 7.0
36
-          env: TWIG_EXT=yes
37
-        - php: 7.1
38
-          env: TWIG_EXT=yes
... ...
@@ -27,7 +27,7 @@
27 27
         "forum": "https://groups.google.com/forum/#!forum/twig-users"
28 28
     },
29 29
     "require": {
30
-        "php": "^5.6|^7.0",
30
+        "php": "^7.0",
31 31
         "symfony/polyfill-mbstring": "~1.0"
32 32
     },
33 33
     "require-dev": {
... ...
@@ -50,4 +50,4 @@
50 50
         }
51 51
     },
52 52
     "minimum-stability": "dev"
53
-}
53
+}
54 54
\ No newline at end of file