From fc5029914846ac0f828132ca1cb5a170af79bd9b Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 6 Mar 2018 16:01:31 +0100
Subject: [PATCH] update travis

---
 .travis.yml        | 51 ++++++++++++++++++++++------------------------
 gen_travis_yml.php | 45 +++++++++++++++++++++++++++++++++-------
 travis/pecl        |  2 +-
 3 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f7f4053..3d8a41b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 # autogenerated file; do not edit
-sudo: false
 language: c
+sudo: false
+dist: trusty
 
 addons:
  apt:
@@ -9,41 +10,37 @@ addons:
    - php-pear
    - valgrind
 
+compiler:
+ - gcc
+ - clang
+
 env:
  matrix:
-  - PHP=5.4 enable_debug=no enable_maintainer_zts=no enable_json=yes
-  - PHP=5.5 enable_debug=no enable_maintainer_zts=no enable_json=yes
-  - PHP=5.6 enable_debug=no enable_maintainer_zts=no enable_json=yes
-  - PHP=7.0 enable_debug=no enable_maintainer_zts=no enable_json=yes
-  - PHP=7.1 enable_debug=no enable_maintainer_zts=no enable_json=yes
+  - PHP=5.4 enable_debug=yes enable_json=yes
+  - PHP=5.5 enable_debug=yes enable_json=yes
+  - PHP=5.6 enable_debug=yes enable_json=yes
+  - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+  - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+  - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=7.2 enable_debug=no enable_maintainer_zts=no enable_json=yes
-  - PHP=master enable_debug=no enable_maintainer_zts=no enable_json=yes
-  - PHP=5.4 enable_debug=yes enable_maintainer_zts=no enable_json=yes
-  - PHP=5.5 enable_debug=yes enable_maintainer_zts=no enable_json=yes
-  - PHP=5.6 enable_debug=yes enable_maintainer_zts=no enable_json=yes
-  - PHP=7.0 enable_debug=yes enable_maintainer_zts=no enable_json=yes
-  - PHP=7.1 enable_debug=yes enable_maintainer_zts=no enable_json=yes
   - PHP=7.2 enable_debug=yes enable_maintainer_zts=no enable_json=yes
-  - PHP=master enable_debug=yes enable_maintainer_zts=no enable_json=yes
-  - PHP=5.4 enable_debug=no enable_maintainer_zts=yes enable_json=yes
-  - PHP=5.5 enable_debug=no enable_maintainer_zts=yes enable_json=yes
-  - PHP=5.6 enable_debug=no enable_maintainer_zts=yes enable_json=yes
-  - PHP=7.0 enable_debug=no enable_maintainer_zts=yes enable_json=yes
-  - PHP=7.1 enable_debug=no enable_maintainer_zts=yes enable_json=yes
   - PHP=7.2 enable_debug=no enable_maintainer_zts=yes enable_json=yes
-  - PHP=master enable_debug=no enable_maintainer_zts=yes enable_json=yes
-  - PHP=5.4 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-  - PHP=5.5 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-  - PHP=5.6 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-  - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-  - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-  - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+  - CFLAGS='-O0 -g --profile' CXXFLAGS='-O0 -g --profile' PHP=7.2 enable_json=yes
+
+cache:
+ directories:
+  - $HOME/cache
 
-before_script:
+before_cache:
+ - find $HOME/cache -name '*.gcda' -o -name '*.gcno' -delete
+
+install:
  - make -f travis/pecl/Makefile php
- - make -f travis/pecl/Makefile ext PECL=json_post
 
 script:
+ - make -f travis/pecl/Makefile ext PECL=json_post
  - make -f travis/pecl/Makefile test
 
+after_success:
+ - test -n "$CFLAGS" && cd src/.libs && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
diff --git a/gen_travis_yml.php b/gen_travis_yml.php
index 3c6fedf..44f45b6 100755
--- a/gen_travis_yml.php
+++ b/gen_travis_yml.php
@@ -1,7 +1,8 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
-sudo: false
 language: c
+sudo: false
+dist: trusty
 
 addons:
  apt:
@@ -10,27 +11,57 @@ addons:
    - php-pear
    - valgrind
 
+compiler:
+ - gcc
+ - clang
+
 env:
  matrix:
 <?php
 
+$cur = "7.2";
 $gen = include "./travis/pecl/gen-matrix.php";
 $env = $gen([
-	"PHP" => ["5.4", "5.5", "5.6", "7.0", "7.1", "7.2", "master"],
+	"PHP" => ["5.4", "5.5", "5.6"],
+	"enable_debug" => "yes",
+	"enable_json" => "yes"
+], [
+	"PHP" => ["7.0", "7.1", "master"],
+	"enable_debug" => "yes",
+	"enable_maintainer_zts" => "yes",
+	"enable_json" => "yes"
+], [
+	"PHP" => $cur,
 	"enable_debug",
 	"enable_maintainer_zts",
-	"enable_json" => ["yes"],
+	"enable_json" => "yes"
+], [
+	"CFLAGS" => "'-O0 -g --profile'",
+	"CXXFLAGS" => "'-O0 -g --profile'",
+	"PHP" => $cur,
+	"enable_json" => "yes"
 ]);
-foreach ($env as $e) {
-	printf("  - %s\n", $e);
+foreach ($env as $grp) {
+	foreach ($grp as $e) {
+		printf("  - %s\n", $e);
+	}
 }
 
 ?>
 
-before_script:
+cache:
+ directories:
+  - $HOME/cache
+
+before_cache:
+ - find $HOME/cache -name '*.gcda' -o -name '*.gcno' -delete
+
+install:
  - make -f travis/pecl/Makefile php
- - make -f travis/pecl/Makefile ext PECL=json_post
 
 script:
+ - make -f travis/pecl/Makefile ext PECL=json_post
  - make -f travis/pecl/Makefile test
 
+after_success:
+ - test -n "$CFLAGS" && cd src/.libs && bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
diff --git a/travis/pecl b/travis/pecl
index 79de9c8..b6683bb 160000
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 79de9c8e52f16a2e06324683cf4c00c91df1b6c1
+Subproject commit b6683bb97ca8618dacf7d101e5844d1bb1b2838a
-- 
2.30.2