Merge pull request #1005 from jingjingxyk/experiment-feature

Experiment feature

Author: jingjingxyk

.github/workflows/windows-cygwin.yml

@@ -34,15 +34,6 @@ jobs:
           ipconfig /all
           # git submodule update --init
 
-      - name: Cache cygwin packages
-        id: cache-cygwin
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-cygwin-packages
-        with:
-          path: C:\cygwin-packages
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-
       - name: Cache pool
         id: cache-cygwin-pool
         uses: actions/cache@v4

README.md

@@ -22,7 +22,6 @@
 - [Swoole-Cli v5.0.1 使用说明](https://wenda.swoole.com/detail/108876)
 - [Swoole-Cli v5.0.0 版本新特性预览之新的运行模式](https://wenda.swoole.com/detail/108706)
 - [Swoole-Cli 已提供 Windows 平台 （cygwin64）支持](https://wenda.swoole.com/detail/108743)
-- [Swoole RFC ](https://github.com/swoole/rfc/)
 - [Swoole v6.1 将提供 typed array 强类型数组实现，增强 PHP 标准库](https://mp.weixin.qq.com/s/yFuxYdNMqxI1VuZg0J07Wg)
 - [Swoole v6 2024 重磅更新：Swoole v6 正式发布，增加 16 项新功能](https://mp.weixin.qq.com/s/Ks1x1LNTLdl5jk0sIS6V_w)
 - [Swoole v6 协程是否支持 PHP 的 JIT ](https://mp.weixin.qq.com/s/Tm-6XVGQSlz0vDENLB3ylA)
@@ -45,6 +44,8 @@
 - [Swoole v6 即将增加多线程支持](https://zhuanlan.zhihu.com/p/688462525)
 - [phpy：连接 PHP 与 Python 互调用库，为 PHP 引入 Python 生态，PHP 也可以写 AI 了](https://zhuanlan.zhihu.com/p/670373512)
 
+## [常见问题解答](https://github.com/swoole/swoole-cli/blob/main/docs/FAQ.md)
+
 ## 下载`swoole-cli`发行版
 
 - [https://www.swoole.com/download](https://www.swoole.com/download) (recommend)

docs/ChangeLog.md

@@ -0,0 +1,34 @@
+# [v6.1.0.0-rc1](https://github.com/swoole/swoole-cli/releases/tag/v6.1.0.0-rc1)
+
+| item           | value        |
+|----------------|--------------|
+| branch         | main         |
+| tag            | v6.1.0.0-rc1 |
+| swoole version | v6.1.0-rc1   |
+| php  version   | 8.1.29       |
+| release date   | 2025-08-31   |
+| status         | ok           |
+
+## [change info](https://github.com/swoole/swoole-cli/compare/v6.0.2.0...v6.1.0.0-rc1)
+
+1. swoole version v6.0.2.0 upgrade to
+   v6.1.0.0-rc1 , [swoole v6.1.0-rc1 info](https://github.com/swoole/swoole-src/releases/tag/v6.1.0-rc1)
+
+# [v5.1.8.0](https://github.com/swoole/swoole-cli/releases/tag/v5.1.8.0)
+
+| item           | value      |
+|----------------|------------|
+| branch         | v5.1.x     |
+| tag            | v5.1.8.0   |
+| swoole version | v5.1.8     |
+| php  version   | 8.1.29     |
+| release date   | 2025-08-23 |
+| status         | ok         |
+
+## [change info](https://github.com/swoole/swoole-cli/compare/v5.1.7.0...v5.1.8.0)
+
+1. swoole version v5.1.7 upgrade to
+   v5.1.8 , [swoole v5.1.8 info](https://github.com/swoole/swoole-src/releases/tag/v5.1.8)
+
+
+

docs/FAQ.md

@@ -0,0 +1,22 @@
+## download  swoole-cli
+
+```shell
+
+curl -fSL https://github.com/swoole/swoole-cli/blob/main/setup-swoole-cli-runtime.sh?raw=true | bash -s -- --version  v5.1.8.0
+
+# from https://www.swoole.com/download
+curl -fSL https://github.com/swoole/swoole-cli/blob/main/setup-swoole-cli-runtime.sh?raw=true | bash -s -- --version  v5.1.8.0 --mirror china
+
+```
+
+## 备注： macos环境下 首次运行提示无权限 ，解决方法
+
+note : macos clearing the com.apple.quarantine extended attribute
+
+```
+xattr ./runtime/swoole-cli/swoole-cli
+
+sudo xattr -rd com.apple.quarantine  ./runtime/swoole-cli/swoole-cli
+
+```
+

sapi/scripts/tencent-cloud-object-storage.sh

@@ -116,7 +116,7 @@ test -f ${APP_RUNTIME} || curl -fSLo ${APP_RUNTIME} https://github.com/tencentyu
 chmod a+x ${APP_RUNTIME}
 
 BUCKET_NAME=$(grep "\- name: " ${CLOUD_OBJECT_STORAGE_CONFIG} | sed 's/\- name: //g' | sed 's/^ *//;s/ *$//' | tr -d '"')
-COSCLI="${__PROJECT__}/var/tencent-cloud-object-storage/${APP_RUNTIME} --config-path ${CLOUD_OBJECT_STORAGE_CONFIG} --log-path ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log "
+COSCLI="${__PROJECT__}/var/tencent-cloud-object-storage/${APP_RUNTIME} --config-path ${CLOUD_OBJECT_STORAGE_CONFIG} --log-path ${__PROJECT__}/var/tencent-cloud-object-storage/"
 COS_BUCKET_FOLDER="cos://${BUCKET_NAME}/dist/"
 
 if [ "${UPLOAD_TYPE}" == 'all' ]; then
@@ -135,17 +135,17 @@ set -u
 if [ "${UPLOAD_TYPE}" == 'all' ]; then
   SWOOLE_VERSION=$(echo ${SWOOLE_CLI_VERSION} | awk -F '.' '{ printf "%s.%s.%s" ,$1,$2,$3 }')
   cd ${__PROJECT__}/var/artifact-hash/${SWOOLE_CLI_VERSION}
-  ${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
-  ${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
-  ${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
-  ${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
-  ${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
   cd ${__PROJECT__}
   exit 0
 fi
 
 if [ "${UPLOAD_TYPE}" == 'single' ]; then
-  ${COSCLI} sync ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
   exit 0
 fi
 

sapi/src/builder/enabled_extensions.php

@@ -41,5 +41,5 @@
     'uuid',
     'xlswriter',
     'gettext',
-    'phpy'
+#    'phpy'
 ];

sapi/src/builder/library/freetype.php

@@ -6,6 +6,9 @@
 return function (Preprocessor $p) {
     $freetype_prefix = FREETYPE_PREFIX;
     $bzip2_prefix = BZIP2_PREFIX;
+    $zlib_prefix = ZLIB_PREFIX;
+    $libpng_prefix = PNG_PREFIX;
+    $brotli_prefix = BROTLI_PREFIX;
     $p->addLibrary(
         (new Library('freetype'))
             ->withHomePage('https://freetype.org/')
@@ -14,31 +17,30 @@
                 'https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/GPLv2.TXT',
                 Library::LICENSE_GPL
             )
-            ->withUrl('https://sourceforge.net/projects/freetype/files/freetype2/2.13.2/freetype-2.13.2.tar.gz')
-            ->withMd5sum('d99447cf00c5f2679918f66f2b5771f6')
-            ->withFileHash('md5', 'd99447cf00c5f2679918f66f2b5771f6')
+            ->withUrl('https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz')
+            ->withFile('freetype-2.13.2.tar.gz')
+            ->withMd5sum('dcd1af080e43fe0c984c34bf3e7d5e16')
+            ->withFileHash('md5', 'dcd1af080e43fe0c984c34bf3e7d5e16')
             ->withPrefix($freetype_prefix)
-            ->withConfigure(
+            ->withBuildCached(false)
+            ->withBuildScript(
                 <<<EOF
-            ./configure --help
-            PACKAGES='zlib libpng  libbrotlicommon  libbrotlienc libbrotlidec '
-            BZIP2_CFLAGS="-I{$bzip2_prefix}/include"  \
-            BZIP2_LIBS="-L{$bzip2_prefix}/lib -lbz2"  \
-            CPPFLAGS="$(pkg-config --cflags-only-I --static \$PACKAGES)" \
-            LDFLAGS="$(pkg-config  --libs-only-L   --static \$PACKAGES)" \
-            LIBS="$(pkg-config     --libs-only-l   --static \$PACKAGES)" \
-            CFLAGS="-std=gnu11" \
-            ./configure \
-            --prefix={$freetype_prefix} \
-            --enable-shared=no \
-            --enable-static=yes \
-            --with-zlib=yes \
-            --with-bzip2=yes \
-            --with-png=yes \
-            --with-harfbuzz=no  \
-            --with-brotli=yes \
-            --enable-freetype-config
+             mkdir -p build
+             cd build
+             cmake .. \
+            -DCMAKE_INSTALL_PREFIX={$freetype_prefix} \
+            -DCMAKE_BUILD_TYPE=Release  \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+            -DBUILD_SHARED_LIBS=OFF  \
+            -DBUILD_STATIC_LIBS=ON \
+            -DFT_REQUIRE_ZLIB=TRUE \
+            -DFT_REQUIRE_BZIP2=TRUE \
+            -DFT_REQUIRE_BROTLI=TRUE \
+            -DFT_REQUIRE_PNG=TRUE \
+            -DFT_DISABLE_HARFBUZZ=TRUE \
+            -DCMAKE_PREFIX_PATH="{$zlib_prefix};{$bzip2_prefix};{$libpng_prefix};{$brotli_prefix}"
 
+            cmake --build . --target install
 EOF
             )
             ->withPkgName('freetype2')