Fix GH-16367: macOS CI fails to configure ext/intl on master

[cmb69]

Well, an attempt.

[cmb69]

Seems to work. Might need to target a lower branch, although I have not yet seen issues except on master; don't understand why, though. Maybe @iluuu1994 knows.

[iluuu1994]

It also fails on push on 8.4, so it should target 8.4 I believe. It's not failing on 8.4 in nightly because the config is wrong.

php-src/.github/nightly_matrix.php

Line 105 in b14076a

'os' => $branch['name'] === 'master' ? '13' : '12',

It seems we accidentally downgraded to macOS 12 for 8.4 when branching. That should be fixed also.

[iluuu1994]

The change LGTM, thank!

[cmb69]

 .github/nightly_matrix.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/nightly_matrix.php b/.github/nightly_matrix.php
index 9ff3567f18..7c2797f249 100644
--- a/.github/nightly_matrix.php
+++ b/.github/nightly_matrix.php
@@ -102,7 +102,7 @@ function get_macos_matrix_include(array $branches) {
                     'branch' => $branch,
                     'debug' => $debug,
                     'zts' => $zts,
-                    'os' => $branch['name'] === 'master' ? '13' : '12',
+                    'os' => in_array($branch['name'], ['master', 'PHP-8.4'], true) ? '13' : '12',
                     'arch' => 'X64',
                     'test_jit' => true,
                 ];

Is that okay, or do you prefer major/minor checks?

[iluuu1994]

Since we're in php we could use version_compare, but I'm happy with either.

[cmb69]

I went with the patch above; nightlies need more work anyway.