From f377b7c11ae28b9c69cecd53ac2e6633fc5140b2 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 30 Nov 2020 17:04:28 +0100
Subject: [PATCH] travis

---
 .travis.yml                | 15 +++++++--------
 scripts/gen_travis_yml.php |  9 ++++-----
 travis/pecl                |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 55bbf49..f8d6312 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 # autogenerated file; do not edit
 language: c
-sudo: false
 
 addons:
  postgresql: 10
@@ -25,14 +24,14 @@ env:
   - 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=7.3 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
-  - PHP=8.0 enable_debug=yes enable_zts=yes enable_json=yes
+  - PHP=7.4 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=master enable_debug=yes enable_zts=yes enable_json=yes
-  - PHP=7.4 enable_json=no
-  - PHP=7.4 enable_json=yes enable_debug=no enable_maintainer_zts=no
-  - PHP=7.4 enable_json=yes enable_debug=yes enable_maintainer_zts=no
-  - PHP=7.4 enable_json=yes enable_debug=no enable_maintainer_zts=yes
-  - PHP=7.4 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
-  - PHP=7.4 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
+  - PHP=8.0 enable_json=no
+  - PHP=8.0 enable_json=yes enable_debug=no enable_zts=no
+  - PHP=8.0 enable_json=yes enable_debug=yes enable_zts=no
+  - PHP=8.0 enable_json=yes enable_debug=no enable_zts=yes
+  - PHP=8.0 enable_json=yes enable_debug=yes enable_zts=yes
+  - PHP=8.0 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
 
 matrix:
  fast_finish: true
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 697fb05..2868592 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -1,7 +1,6 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
 language: c
-sudo: false
 
 addons:
  postgresql: 10
@@ -25,14 +24,14 @@ env:
 <?php
 
 $gen = include "./travis/pecl/gen-matrix.php";
-$cur = "7.4";
+$cur = "8.0";
 $env = $gen([
-	"PHP" => ["7.0", "7.1", "7.2", "7.3"],
+	"PHP" => ["7.0", "7.1", "7.2", "7.3", "7.4"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
 ], [
-	"PHP" => ["8.0", "master"],
+	"PHP" => ["master"],
 	"enable_debug" => "yes",
 	"enable_zts" => "yes",
 	"enable_json" => "yes",
@@ -43,7 +42,7 @@ $env = $gen([
 	"PHP" => $cur,
 	"enable_json" => "yes",
 	"enable_debug",
-	"enable_maintainer_zts"
+	"enable_zts"
 ], [
 	"PHP" => $cur,
 	"enable_json" => "yes",
diff --git a/travis/pecl b/travis/pecl
index 309d295..4508f56 160000
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 309d295271f95d9267c64535de8c2e638f6614cc
+Subproject commit 4508f562f8ef3c07b4490bef0e7563e73ef9a5f0
-- 
2.30.2