From 8e58592a6e93d02a501bc30849273d0c41b8d9b0 Mon Sep 17 00:00:00 2001 From: Jerry Ma Date: Mon, 4 Mar 2024 15:31:39 +0800 Subject: [PATCH] Fix swoole compile bug on Linux (#367) * swoole ci test * swoole ci test * fix swoole (disable-thread-context) * restore pgsql ver * bump version to 2.1.4 --- src/SPC/ConsoleApplication.php | 2 +- src/SPC/builder/extension/swoole.php | 4 ++-- src/globals/test-extensions.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SPC/ConsoleApplication.php b/src/SPC/ConsoleApplication.php index 63eae94e..a0f65f26 100644 --- a/src/SPC/ConsoleApplication.php +++ b/src/SPC/ConsoleApplication.php @@ -25,7 +25,7 @@ use Symfony\Component\Console\Command\ListCommand; */ final class ConsoleApplication extends Application { - public const VERSION = '2.1.3'; + public const VERSION = '2.1.4'; public function __construct() { diff --git a/src/SPC/builder/extension/swoole.php b/src/SPC/builder/extension/swoole.php index f9da2005..1e892ee5 100644 --- a/src/SPC/builder/extension/swoole.php +++ b/src/SPC/builder/extension/swoole.php @@ -15,8 +15,8 @@ class swoole extends Extension // enable swoole $arg = '--enable-swoole'; - // commonly-used feature: coroutine-time, thread-context - $arg .= ' --enable-swoole-coro-time --enable-thread-context'; + // commonly-used feature: coroutine-time, disable-thread-context + $arg .= ' --enable-swoole-coro-time --disable-thread-context'; // required feature: curl, openssl (but curl hook is buggy for php 8.0) $arg .= $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl'; diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index c8282021..cd12034c 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -13,8 +13,8 @@ declare(strict_types=1); // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'amqp', - 'Windows' => 'mbstring,pdo_sqlite,mbregex,ffi,amqp', + 'Linux', 'Darwin' => 'swoole,swoole-hook-mysql,swoole-hook-pgsql,swoole-hook-sqlite,openssl,curl,pdo_mysql', + 'Windows' => 'mbstring,pdo_sqlite,mbregex,ffi', }; // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`). @@ -27,7 +27,7 @@ $with_libs = match (PHP_OS_FAMILY) { // You can use `common`, `bulk`, `minimal` or `none`. // note: combination is only available for *nix platform. Windows must use `none` combination $base_combination = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'common', + 'Linux', 'Darwin' => 'minimal', 'Windows' => 'none', };