Merge branch 'PHP-8.1' into PHP-8.2

iluuu1994 · iluuu1994 · commit 70c29f84b1e0 · 2023-03-15T02:11:49.000+01:00
* PHP-8.1:
  [skip ci] Skip upload_2G.phpt on Cirrus
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
@@ -36,6 +36,8 @@ if (getenv('TRAVIS')) {
     die("skip Fails intermittently on travis");
 }
 
+if (getenv('CIRRUS_CI')) die('skip Fails on Cirrus');
+
 if (getenv('SKIP_PERF_SENSITIVE')) {
     die("skip Test may be very slow if PHP is instrumented");
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ if (getenv('TRAVIS')) {`
`36`	`36`	`die("skip Fails intermittently on travis");`
`37`	`37`	`}`
`38`	`38`
	`39`	`+if (getenv('CIRRUS_CI')) die('skip Fails on Cirrus');`
	`40`	`+`
`39`	`41`	`if (getenv('SKIP_PERF_SENSITIVE')) {`
`40`	`42`	`die("skip Test may be very slow if PHP is instrumented");`
`41`	`43`	`}`