From 3896b080bb717c21d737bed13b8b20cf627a9ce3 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Fri, 1 Mar 2019 10:38:23 +0100 Subject: [PATCH] travis: xenial --- .travis.yml | 36 +++++++++++++++++------------------- scripts/gen_travis_yml.php | 21 ++++++++------------- 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bdbc0e..25ab402 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,16 @@ language: c addons: apt: packages: - - php5-cli + - php-cli - php-pear - libcurl4-openssl-dev - libidn11-dev - libidn2-0-dev - libicu-dev - libevent-dev + - libbrotli-dev + +dist: xenial compiler: - gcc @@ -24,28 +27,23 @@ before_cache: - find $HOME/cache -name '*.gcda' -o -name '*.gcno' -delete env: - - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=7.3 with_http_libicu_dir=no with_http_libidn_dir=no with_http_libidn2_dir=no with_http_libcurl_dir=no with_http_libevent_dir=no - - PHP=7.3 enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=7.3 enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=7.3 enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli - - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli with_http_libicu_dir=yes with_http_libidn_dir=no with_http_libidn2_dir=no - - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli with_http_libidn_dir=yes with_http_libicu_dir=no with_http_libidn2_dir=no - - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli with_http_libidn2_dir=yes with_http_libicu_dir=no with_http_libidn_dir=no + - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 with_http_libicu_dir=no with_http_libidn_dir=no with_http_libidn2_dir=no with_http_libcurl_dir=no with_http_libevent_dir=no with_http_libbrotli_dir=no + - PHP=7.3 enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libicu_dir=yes with_http_libidn_dir=no with_http_libidn2_dir=no + - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libidn_dir=yes with_http_libicu_dir=no with_http_libidn2_dir=no + - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libidn2_dir=yes with_http_libicu_dir=no with_http_libidn_dir=no matrix: - include: - - os: linux - dist: trusty - - os: linux - dist: xenial fast_finish: true allow_failures: - - env: PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli + - env: PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes install: - ./travis/brotli.sh v1.0.2 diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php index 8025713..bcbd348 100755 --- a/scripts/gen_travis_yml.php +++ b/scripts/gen_travis_yml.php @@ -5,13 +5,16 @@ language: c addons: apt: packages: - - php5-cli + - php-cli - php-pear - libcurl4-openssl-dev - libidn11-dev - libidn2-0-dev - libicu-dev - libevent-dev + - libbrotli-dev + +dist: xenial compiler: - gcc @@ -37,7 +40,6 @@ $env = $gen([ "enable_json" => "yes", "enable_hash" => "yes", "enable_iconv" => "yes", - "with_http_libbrotli_dir" => "/home/travis/brotli" ], [ // everything disabled for current "PHP" => $cur, @@ -46,6 +48,7 @@ $env = $gen([ "with_http_libidn2_dir" => "no", "with_http_libcurl_dir" => "no", "with_http_libevent_dir" => "no", + "with_http_libbrotli_dir" => "no", ], [ // everything enabled for current, switching on debug/zts "PHP" => $cur, @@ -54,7 +57,6 @@ $env = $gen([ "enable_json" => "yes", "enable_hash" => "yes", "enable_iconv" => "yes", - "with_http_libbrotli_dir" => "/home/travis/brotli", ], [ // once everything enabled for current, with coverage "CFLAGS" => "'-O0 -g --coverage'", @@ -63,33 +65,26 @@ $env = $gen([ "enable_json" => "yes", "enable_hash" => "yes", "enable_iconv" => "yes", - "with_http_libbrotli_dir" => "/home/travis/brotli", [ "with_http_libicu_dir", "with_http_libidn_dir", "with_http_libidn2_dir", ], ]); -$allow_failures = []; foreach ($env as $grp) { foreach ($grp as $e) { - if (!strncmp($e, "PHP=master", strlen("PHP=master"))) { - $allow_failures[] = $e; - } printf(" - %s\n", $e); } } ?> matrix: - include: - - os: linux - dist: trusty - - os: linux - dist: xenial fast_finish: true allow_failures: