Skip to content

Conversation

shivammathur
Copy link
Member

@shivammathur shivammathur commented Oct 13, 2025

This PR upgrades macOS version in the nightly workflow as macos-13 has been deprecated and will be discontinued soon. The next x86_64 macOS version they have added in macOS 15.
(actions/runner-images#13046)
So, we can upgrade to.

  • macOS 15 (macos-15-intel) for all x86_64 runs.
  • macOS 15 for 8.5 and master. we can keep macOS 14 for 8.1 to 8.4 for arm64.

Issues Identified on macOS 15.

  • JIT TLS changes in macos 15 causes segfaults. (Fixed in Fix JIT TLS on MacOS 15 #20121)
  • Test ext/ctype/tests/lc_ctype_inheritance.phpt fails on macOS 15 as it inherits LC_CTYPE into the thread locale. We can skip the test on macos 15 as the issue is a due to a change by Apple as discussed in str_word_count behaves differently on macos 14 vs 15+ #19828.
  • 8.1 does not build on macos 15 with this error (no_caller_saved_registers function calls memcmp (Zend/zend_string.c:389). Logs . We can backport 6339938 in PHP-8.1 (patch), but I'm not sure as the branch is now for security-fixes only.

Copy link
Member

@iluuu1994 iluuu1994 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this PR. It does look correct to me.

We can backport 6339938 in PHP-8.1 (patch), but I'm not sure as the branch is now for security-fixes only.

If this is the only necessary change it seems ok, but RMs should confirm.

@shivammathur shivammathur marked this pull request as ready for review October 13, 2025 20:35
@shivammathur shivammathur merged commit e3e37c8 into php:master Oct 15, 2025
10 checks passed
@iluuu1994
Copy link
Member

Thanks @shivammathur for handling this!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants