From 2ef77bacbf215c22471adf5c1c5e796d29cd7512 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sat, 13 Sep 2025 00:57:56 +0800 Subject: [PATCH] Test libjxl on macOS x86_64 --- config/source.json | 2 +- src/globals/test-extensions.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/source.json b/config/source.json index 4a0e0fdb..128eafab 100644 --- a/config/source.json +++ b/config/source.json @@ -560,7 +560,7 @@ "libjxl": { "type": "git", "url": "https://github.com/libjxl/libjxl", - "rev": "main", + "rev": "0.11.x", "submodules": [ "third_party/highway", "third_party/libjpeg-turbo", diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 764cfc7d..fbb31006 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -26,16 +26,16 @@ $test_os = [ 'macos-13', // bin/spc for x86_64 // 'macos-14', // bin/spc for arm64 '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-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-22.04-arm', // bin/spc-gnu-docker for arm64 // 'ubuntu-24.04-arm', // bin/spc for arm64 // 'windows-latest', // .\bin\spc.ps1 ]; // whether enable thread safe -$zts = true; +$zts = false; $no_strip = false; @@ -50,13 +50,13 @@ $prefer_pre_built = false; // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'bcmath', + 'Linux', 'Darwin' => 'imagick', 'Windows' => 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pdo,pdo_mysql,pdo_sqlite,phar,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip', }; // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`). $shared_extensions = match (PHP_OS_FAMILY) { - 'Linux' => 'zip', + 'Linux' => '', 'Darwin' => '', 'Windows' => '', }; @@ -66,7 +66,7 @@ $with_suggested_libs = true; // If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true. $with_libs = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => '', + 'Linux', 'Darwin' => 'libjxl', 'Windows' => '', };