travis

diff --git a/.travis.yml b/.travis.yml
index b7c0962069f9e95dc8b9e2127ebf115e7285e7a6..e882d3cb8b3a4c729add984be9f82346423964c0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 # autogenerated file; do not edit
-sudo: false
 language: c
-dist: xenial
 
 addons:
  apt:
@@ -14,18 +12,12 @@ env:
  - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
- - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
  - PHP=7.4 enable_json=yes enable_debug=no enable_maintainer_zts=no
  - PHP=7.4 enable_json=yes enable_debug=yes enable_maintainer_zts=no
  - PHP=7.4 enable_json=yes enable_debug=no enable_maintainer_zts=yes
  - PHP=7.4 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
  - PHP=7.4 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
 
-matrix:
- fast_finish: true
- allow_failures:
-  - env: PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-
 before_script:
  - make -f travis/pecl/Makefile php
  - make -f travis/pecl/Makefile ext PECL=propro

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 68bdd7cc8608470f670434abf5de32e20d9ff598..8e9f951831dffbd82dd2dc14231d045cc66aed2d 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -1,8 +1,6 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
-sudo: false
 language: c
-dist: xenial
 
 addons:
  apt:
@@ -15,7 +13,7 @@ env:
 $gen = include "./travis/pecl/gen-matrix.php";
 $cur = "7.4";
 $env = $gen([
-       "PHP" => ["7.0", "7.1", "7.2", "7.3", "master"],
+       "PHP" => ["7.0", "7.1", "7.2", "7.3"],
        "enable_debug" => "yes",
        "enable_maintainer_zts" => "yes",
        "enable_json" => "yes",
@@ -38,18 +36,6 @@ foreach ($env as $g) {
 }
 ?>
 
-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=propro

diff --git a/travis/pecl b/travis/pecl
index 54a746ab5e068060f53796d0aca55f76656bb8b1..4508f562f8ef3c07b4490bef0e7563e73ef9a5f0 160000 (submodule)
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 54a746ab5e068060f53796d0aca55f76656bb8b1
+Subproject commit 4508f562f8ef3c07b4490bef0e7563e73ef9a5f0