travis: condense build matrix

diff --git a/.travis.yml b/.travis.yml
index 9775fead985d56f7174db6d01c7fab1372bc76ef..dab6702c46618b70f3337d2ab470fa1342c31bdf 100644 (file)
--- 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 ef73806fe757f2873e6d85952e4f279d496b979f..18dccde8273ea594c31b3b553967b219453382b1 100755 (executable)
--- 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",