From 3fa287dfd76814b2ec54991c0208a019845a3dc0 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 18 Oct 2016 12:36:50 +0200 Subject: [PATCH] travis trusty --- .travis.yml | 5 ++++- Makefile.frag | 2 ++ scripts/gen_travis_yml.php | 5 +++-- travis/pecl | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2de389..559e2a1 100644 --- 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 f98715d..c7c7106 100644 --- 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 86c611d..ef1ae8a 100755 --- 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 23c2876..90af692 160000 --- a/travis/pecl +++ b/travis/pecl @@ -1 +1 @@ -Subproject commit 23c2876aaa0808bcfedc1c5c30da6e8234341a13 +Subproject commit 90af692cb807f63c4d4e943ff4699dc9637728fb -- 2.30.2