From 84bb804822add42df03d7765169a58ff8234c886 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sat, 2 Mar 2019 12:13:35 +0100 Subject: [PATCH] travis: condense build matrix --- .travis.yml | 16 ++++++++-------- scripts/gen_travis_yml.php | 7 ++----- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9775fea..dab6702 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,10 +15,6 @@ addons: dist: xenial -compiler: - - gcc - - clang - cache: apt: true directories: @@ -32,10 +28,14 @@ env: - 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 + - PHP=7.3 CC=gcc enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=clang enable_debug=no enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=gcc enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=clang enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=gcc enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=clang enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=gcc enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes + - PHP=7.3 CC=clang 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 diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php index ef73806..18dccde 100755 --- a/scripts/gen_travis_yml.php +++ b/scripts/gen_travis_yml.php @@ -16,10 +16,6 @@ addons: dist: xenial -compiler: - - gcc - - clang - cache: apt: true directories: @@ -50,8 +46,9 @@ $env = $gen([ "with_http_libevent_dir" => "no", "with_http_libbrotli_dir" => "no", ], [ -// everything enabled for current, switching on debug/zts +// everything enabled for current, switching on CC and debug/zts "PHP" => $cur, + "CC" => ["gcc", "clang"], "enable_debug", "enable_maintainer_zts", "enable_json" => "yes", -- 2.30.2