From 0117fcb3c6b2642644c5f5e0a1d1346cf1300f1a Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Wed, 12 Nov 2025 08:37:51 +0800 Subject: [PATCH 1/2] swoole upgrade to v6.1.2 --- docs/ChangeLog.md | 4 ++-- docs/tags.md | 8 ++++---- sapi/SWOOLE-VERSION.conf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md index f110a0d262..1257b9541a 100644 --- a/docs/ChangeLog.md +++ b/docs/ChangeLog.md @@ -1,4 +1,4 @@ -## v6.1.1.0 +## v6.1.2.0 ### 新增 @@ -13,7 +13,7 @@ 2. github macos amd64 构建环境由 `macos-13` 升级为 `macos-15-intel` 3. github macos arm64 构建环境由 `macos-14` 升级为 `macos-15` 4. 扩展 `swoole` 版本由 `v5.1.x` - 升级为 `v6.1.1`，[swoole v6.1.1 info](https://github.com/swoole/swoole-src/releases/tag/v6.1.0) + 升级为 `v6.1.2`，[swoole v6.1.2 info](https://github.com/swoole/swoole-src/releases/tag/v6.1.2) 5. 扩展 `redis` 版本由 `5.3.7` 升级为 `6.2.0` 6. 扩展 `imagick` 版本由 `3.6.0` 升级为 `3.8.0` 7. `openssl` 库版本由 `v3.1.4` 升级为 `v3.6.0` ( openssl 3.5 支持了 quic 协议堆栈) diff --git a/docs/tags.md b/docs/tags.md index 2d54700b64..e87cf70d30 100644 --- a/docs/tags.md +++ b/docs/tags.md @@ -3,14 +3,14 @@ | item | value | |----------------|------------| | branch | main | -| tag | v6.1.1.0 | -| swoole version | v6.1.1 | +| tag | v6.1.2.0 | +| swoole version | v6.1.2 | | php version | 8.4.14 | -| release date | 2025-11-10 | +| release date | 2025-11-12 | | status | ok | 1. [change info](https://github.com/swoole/swoole-cli/blob/ChangeLog-v6.1.1/docs/ChangeLog.md#v6110) -1. [Code Change Info](https://github.com/swoole/swoole-cli/compare/v6.0.2.0...v6.1.1.0) +1. [Code Change Info](https://github.com/swoole/swoole-cli/compare/v6.0.2.0...v6.1.2.0) 1. [faq](https://github.com/swoole/swoole-cli/blob/ChangeLog-v6.1.1/docs/FAQ.md) # [v6.1.0.0-rc1](https://github.com/swoole/swoole-cli/releases/tag/v6.1.0.0-rc1) diff --git a/sapi/SWOOLE-VERSION.conf b/sapi/SWOOLE-VERSION.conf index 035fbdc6e7..b8bdbe06ff 100644 --- a/sapi/SWOOLE-VERSION.conf +++ b/sapi/SWOOLE-VERSION.conf @@ -1 +1 @@ -v6.1.1 +v6.1.2 From 9f1fc78575042649c6b184ac31e5276632a016ea Mon Sep 17 00:00:00 2001 From: jingjingxyk Date: Thu, 13 Nov 2025 14:41:57 +0800 Subject: [PATCH 2/2] test swoole v6.1.2 --- sapi/SWOOLE-VERSION.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/SWOOLE-VERSION.conf b/sapi/SWOOLE-VERSION.conf index b8bdbe06ff..1f7391f92b 100644 --- a/sapi/SWOOLE-VERSION.conf +++ b/sapi/SWOOLE-VERSION.conf @@ -1 +1 @@ -v6.1.2 +master