travis trusty

diff --git a/.travis.yml b/.travis.yml
index c2de389683898fcf21c6815f63d1af43430687bf..559e2a12550b4cacaddb501d4dff765210e4108e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 # autogenerated file; do not edit
 language: c
-sudo: false
+sudo: required
+dist: trusty
 
 addons:
  apt:
@@ -12,8 +13,10 @@ addons:
 env:
  matrix:
   - PHP=7.0 enable_debug=no enable_psi=yes enable_psi_posix=all
+  - PHP=7.1 enable_debug=no enable_psi=yes enable_psi_posix=all
   - PHP=master enable_debug=no enable_psi=yes enable_psi_posix=all
   - PHP=7.0 enable_debug=yes enable_psi=yes enable_psi_posix=all
+  - PHP=7.1 enable_debug=yes enable_psi=yes enable_psi_posix=all
   - PHP=master enable_debug=yes enable_psi=yes enable_psi_posix=all
 
 before_script:

diff --git a/Makefile.frag b/Makefile.frag
index f98715d0bdba1becda2eb871e744b5390595b12f..c7c7106ee0c1d5e5a6f4d10728b1391099447e7c 100644 (file)
--- a/Makefile.frag
+++ b/Makefile.frag
@@ -3,6 +3,8 @@
 PHP_PSI_HEADERS := $(addprefix $(PHP_PSI_BUILDDIR)/,$(PHP_PSI_HEADERS))
 PHP_PSI_SOURCES := $(addprefix $(PHP_PSI_SRCDIR)/,$(PHP_PSI_SOURCES))
 
+$(PHP_PSI_BUILDDIR)/types/%.h: $(PHP_PSI_SRCDIR)/src/types/%.h
+       @cat >$@ <$<
 $(PHP_PSI_BUILDDIR)/%.h: $(PHP_PSI_SRCDIR)/src/%.h
        @cat >$@ <$<
 

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 86c611d0fcee3802a38b082491c267b61f099c4d..ef1ae8a5203c45a38376c9b62cc674ca115ab44b 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -1,7 +1,8 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
 language: c
-sudo: false
+sudo: required
+dist: trusty
 
 addons:
  apt:
@@ -16,7 +17,7 @@ env:
 
 $gen = include __DIR__."/../travis/pecl/gen-matrix.php";
 $env = $gen([
-       "PHP" => ["7.0", "master"],
+       "PHP" => ["7.0", "7.1", "master"],
        "enable_debug",
        #"enable_maintainer_zts",
        "enable_psi" => ["yes"],

diff --git a/travis/pecl b/travis/pecl
index 23c2876aaa0808bcfedc1c5c30da6e8234341a13..90af692cb807f63c4d4e943ff4699dc9637728fb 160000 (submodule)
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 23c2876aaa0808bcfedc1c5c30da6e8234341a13
+Subproject commit 90af692cb807f63c4d4e943ff4699dc9637728fb