From 9fdfef50574d6eed60d707e0f0d2a304c7c7825d Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Thu, 18 Dec 2025 21:21:47 +0800 Subject: [PATCH] macOS don't need to disable avx2 explicitly (#1007) --- src/SPC/ConsoleApplication.php | 2 +- src/SPC/builder/unix/library/libwebp.php | 2 +- src/globals/test-extensions.php | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php index 7fc56ae3..9500a231 100644 --- a/src/SPC/ConsoleApplication.php +++ b/src/SPC/ConsoleApplication.php @@ -34,7 +34,7 @@ use Symfony\Component\Console\Application; */ final class ConsoleApplication extends Application { - public const string VERSION = '2.7.10'; + public const string VERSION = '2.7.11'; public function __construct() { diff --git a/src/SPC/builder/unix/library/libwebp.php b/src/SPC/builder/unix/library/libwebp.php index 47fd0078..06818582 100644 --- a/src/SPC/builder/unix/library/libwebp.php +++ b/src/SPC/builder/unix/library/libwebp.php @@ -13,7 +13,7 @@ trait libwebp $code = 'int main() { return _mm256_cvtsi256_si32(_mm256_setzero_si256()); }'; $cc = getenv('CC') ?: 'gcc'; [$ret] = shell()->execWithResult("echo '{$code}' | {$cc} -x c -mavx2 -o /dev/null - 2>&1"); - $disableAvx2 = $ret !== 0 && GNU_ARCH === 'x86_64'; + $disableAvx2 = $ret !== 0 && GNU_ARCH === 'x86_64' && PHP_OS_FAMILY === 'Linux'; UnixCMakeExecutor::create($this) ->addConfigureArgs( diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 72e75124..cdd27e23 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -23,13 +23,13 @@ $test_php_version = [ // test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available) $test_os = [ - // 'macos-15-intel', // bin/spc for x86_64 + 'macos-15-intel', // bin/spc for x86_64 // 'macos-15', // bin/spc for arm64 // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64 - 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 - 'ubuntu-24.04', // bin/spc for x86_64 - 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 - 'ubuntu-24.04-arm', // bin/spc for arm64 + // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 + // 'ubuntu-24.04', // bin/spc for x86_64 + // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 + // 'ubuntu-24.04-arm', // bin/spc for arm64 // 'windows-2022', // .\bin\spc.ps1 // 'windows-2025', ];