Skip to content

Fix macOS CI #24409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shivammathur merged 4 commits into from
Oct 18, 2026
+36 −7
Merged

Fix macOS CI #24409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
02a73af
Run brew update in macOS CI
shivammathur Oct 16, 2026
d3d9dbb
Drop intel macOS from CI
shivammathur Oct 18, 2026
943c119
Fix build on Apple Clang 17+ (#18629)
kocsismate May 24, 2025
3d53001
Cleanup macOS job in test-suite.yml
shivammathur Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/brew/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ runs:
run: |
set -x

brew update

# Patch brew to overwrite always
formula_installer="$(brew --repo)"/Library/Homebrew/formula_installer.rb
code=" keg.link\(verbose: verbose\?"
Expand Down
5 changes: 2 additions & 3 deletions .github/matrix.php
View file
Open in desktop

@TimWolla TimWolla Oct 18, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This started to enable ARM for 8.2 and 8.3. Is this intentional or should macOS be skipped entirely for these?

@shivammathur shivammathur Oct 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes, that is intentional, dropping macOS entirely might cause regressions for those versions.

Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,9 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
: ['debug' => [true], 'zts' => [true]];
}
if ($all_jobs || !$no_jobs || $test_macos) {
$test_arm = version_compare($php_version, '8.4', '>=');
$jobs['MACOS']['matrix'] = $all_variations
? ['arch' => $test_arm ? ['X64', 'ARM64'] : ['X64'], 'debug' => [true, false], 'zts' => [true, false]]
: ['include' => [['arch' => $test_arm ? 'ARM64' : 'X64', 'debug' => true, 'zts' => false]]];
? ['arch' => ['ARM64'], 'debug' => [true, false], 'zts' => [true, false]]
: ['include' => [['arch' => 'ARM64', 'debug' => true, 'zts' => false]]];
$jobs['MACOS']['config']['version'] = version_compare($php_version, '8.4', '>=') ? '26' : '15';
}
if ($all_jobs || $test_msan) {
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-suite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ jobs:
fail-fast: false
matrix: ${{ fromJson(inputs.branch).jobs.MACOS.matrix }}
name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
runs-on: macos-${{ fromJson(inputs.branch).jobs.MACOS.config.version }}${{ matrix.arch == 'X64' && '-intel' || '' }}
runs-on: macos-${{ fromJson(inputs.branch).jobs.MACOS.config.version }}
timeout-minutes: 180
steps:
- name: git checkout
Expand Down Expand Up @@ -345,18 +345,18 @@ jobs:
if: ${{ inputs.all_variations }}
uses: ./.github/actions/test-macos
- name: Test Tracing JIT
if: ${{ matrix.arch == 'X64' || !matrix.zts }}
if: ${{ !matrix.zts }}
uses: ./.github/actions/test-macos
with:
enableOpcache: true
jitType: tracing
- name: Test OpCache
if: ${{ inputs.all_variations || (matrix.arch == 'ARM64' && matrix.zts) }}
if: ${{ inputs.all_variations || matrix.zts }}
uses: ./.github/actions/test-macos
with:
enableOpcache: true
- name: Test Function JIT
if: ${{ inputs.all_variations && (matrix.arch == 'X64' || !matrix.zts) }}
if: ${{ inputs.all_variations && !matrix.zts }}
uses: ./.github/actions/test-macos
with:
enableOpcache: true
Expand Down
28 changes: 28 additions & 0 deletions Zend/zend_cpuinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,58 +121,86 @@ ZEND_API int zend_cpu_supports(zend_cpu_feature feature);
* functions */
ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse2(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("sse2");
#endif
}

ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse3(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("sse3");
#endif
}

ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_ssse3(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("ssse3");
#endif
}

ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse41(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("sse4.1");
#endif
}

ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_sse42(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("sse4.2");
#endif
}

ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_avx(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("avx");
#endif
}

ZEND_NO_SANITIZE_ADDRESS
static inline int zend_cpu_supports_avx2(void) {
#ifdef __aarch64__
return 0;
#else
#if PHP_HAVE_BUILTIN_CPU_INIT
__builtin_cpu_init();
#endif
return __builtin_cpu_supports("avx2");
#endif
}
#else

Expand Down
Loading