From 4dacc3617c40de5f52475283fd735b751e24de10 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Tue, 11 Aug 2015 09:48:23 +0200 Subject: [PATCH] add master to the test matrix --- .travis.yml | 8 ++++++-- gen_travis_yml.php | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 08724d5..c7c907d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ # autogenerated file; do not edit +sudo: false language: c addons: @@ -12,21 +13,24 @@ env: - PHP=5.4 enable_debug=no enable_maintainer_zts=no - PHP=5.5 enable_debug=no enable_maintainer_zts=no - PHP=5.6 enable_debug=no enable_maintainer_zts=no + - PHP=master enable_debug=no enable_maintainer_zts=no - PHP=5.4 enable_debug=yes enable_maintainer_zts=no - PHP=5.5 enable_debug=yes enable_maintainer_zts=no - PHP=5.6 enable_debug=yes enable_maintainer_zts=no + - PHP=master enable_debug=yes enable_maintainer_zts=no - PHP=5.4 enable_debug=no enable_maintainer_zts=yes - PHP=5.5 enable_debug=no enable_maintainer_zts=yes - PHP=5.6 enable_debug=no enable_maintainer_zts=yes + - PHP=master enable_debug=no enable_maintainer_zts=yes - PHP=5.4 enable_debug=yes enable_maintainer_zts=yes - PHP=5.5 enable_debug=yes enable_maintainer_zts=yes - PHP=5.6 enable_debug=yes enable_maintainer_zts=yes + - PHP=master enable_debug=yes enable_maintainer_zts=yes before_script: - make -f travis/pecl/Makefile php + - make -f travis/pecl/Makefile ext PECL=apfd script: - - make -f travis/pecl/Makefile ext PECL=apfd - make -f travis/pecl/Makefile test -sudo: false diff --git a/gen_travis_yml.php b/gen_travis_yml.php index 277c5a9..8537d55 100755 --- a/gen_travis_yml.php +++ b/gen_travis_yml.php @@ -1,5 +1,6 @@ #!/usr/bin/env php # autogenerated file; do not edit +sudo: false language: c addons: @@ -14,7 +15,7 @@ env: $gen = include "./travis/pecl/gen-matrix.php"; $env = $gen([ - "PHP" => ["5.4", "5.5", "5.6"], + "PHP" => ["5.4", "5.5", "5.6", "master"], "enable_debug", "enable_maintainer_zts", ]); @@ -26,9 +27,8 @@ foreach ($env as $e) { before_script: - make -f travis/pecl/Makefile php + - make -f travis/pecl/Makefile ext PECL=apfd script: - - make -f travis/pecl/Makefile ext PECL=apfd - make -f travis/pecl/Makefile test -sudo: false -- 2.30.2