Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2: [skip ci] Another flaky phar macOS test
Sannis · Feb 4, 2025 · 88e1917 · 88e1917
2 parents 7e06a81 + 99d2055
commit 88e1917
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/ext/phar/tests/zip/033.phpt b/ext/phar/tests/zip/033.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