update travis

diff --git a/.travis.yml b/.travis.yml
index d621a25b8fb413eb7922025cc9279ddd59e43098..94d86d12496fd6794c6751ff0799772202ac32f7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,28 @@
 # autogenerated file; do not edit
 sudo: false
 language: c
+dist: xenial
 
 addons:
  apt:
   packages:
-   - php5-cli
+   - php-cli
    - php-pear
 
 env:
- - PHP=7.0 enable_debug=no enable_maintainer_zts=no
- - PHP=7.1 enable_debug=no enable_maintainer_zts=no
- - PHP=7.2 enable_debug=no enable_maintainer_zts=no
- - PHP=7.3 enable_debug=no enable_maintainer_zts=no
- - PHP=master enable_debug=no enable_maintainer_zts=no
- - PHP=7.0 enable_debug=yes enable_maintainer_zts=no
- - PHP=7.1 enable_debug=yes enable_maintainer_zts=no
- - PHP=7.2 enable_debug=yes enable_maintainer_zts=no
- - PHP=7.3 enable_debug=yes enable_maintainer_zts=no
- - PHP=master enable_debug=yes enable_maintainer_zts=no
- - PHP=7.0 enable_debug=no enable_maintainer_zts=yes
- - PHP=7.1 enable_debug=no enable_maintainer_zts=yes
- - PHP=7.2 enable_debug=no enable_maintainer_zts=yes
- - PHP=7.3 enable_debug=no enable_maintainer_zts=yes
- - PHP=master enable_debug=no enable_maintainer_zts=yes
- - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes
- - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes
- - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes
- - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes
- - PHP=master enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes
+  - PHP=master enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.3 enable_debug=no enable_maintainer_zts=no
+  - PHP=7.3 enable_debug=yes enable_maintainer_zts=no
+  - PHP=7.3 enable_debug=no enable_maintainer_zts=yes
+  - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes
+
+matrix:
+ fast_finish: true
+ allow_failures:
+  - env: PHP=master enable_debug=yes enable_maintainer_zts=yes
 
 before_script:
  - make -f travis/pecl/Makefile php

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 9cc68f9e039a9be4bd5df02370db3685f7d0c243..48bfda8278d73d67c1f86709c6178b263416d788 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -2,30 +2,48 @@
 # autogenerated file; do not edit
 sudo: false
 language: c
+dist: xenial
 
 addons:
  apt:
   packages:
-   - php5-cli
+   - php-cli
    - php-pear
 
 env:
 <?php
 
+$cur = "7.3";
 $gen = include "./travis/pecl/gen-matrix.php";
 $env = $gen([
-       "PHP" => ["7.0", "7.1", "7.2", "7.3", "master"],
+       "PHP" => ["7.0", "7.1", "7.2", "master"],
+       "enable_debug" => "yes",
+       "enable_maintainer_zts" => "yes",
+], [
+       "PHP" => $cur,
        "enable_debug",
-       "enable_maintainer_zts",
+       "enable_maintainer_zts"
 ]);
 foreach ($env as $grp) {
        foreach ($grp as $e) {
-               printf(" - %s\n", $e);
+               printf("  - %s\n", $e);
        }
 }
 
 ?>
 
+matrix:
+ fast_finish: true
+ allow_failures:
+<?php
+$allow_failures = array_merge( ... array_map(function($a) {
+       return preg_grep('/^PHP=master /', $a);
+}, $env));
+foreach ($allow_failures as $e) {
+       printf("  - env: %s\n", $e);
+}
+?>
+
 before_script:
  - make -f travis/pecl/Makefile php
  - make -f travis/pecl/Makefile ext PECL=raphf