Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: [skip ci] Mark another phar test as flaky on macOS
devnexen · Oct 18, 2024 · fe31018 · fe31018
2 parents 9923e14 + ce44a7f
commit fe31018
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/ext/phar/tests/phar_oo_iswriteable.phpt b/ext/phar/tests/phar_oo_iswriteable.phpt
@@ -5,6 +5,12 @@ phar
 --INI--
 phar.readonly=0
 phar.require_hash=0
+--SKIPIF--
+<?php
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") {
+    die("flaky Occasionally segfaults on macOS for unknown reasons");
+}
+?>
 --FILE--
 <?php
 $fname = __DIR__ . '/' . basename(__FILE__, '.php') . '.1.phar.php';