拉取main 分支代码到 v5.1.x 分支 (#810)

* 完善 upgrade php version to 8.1.29 (#752) * update * sync php code * update extension swoole code * update setup-php-runtime.sh (#751) * disable swoolg pg test (#755) * disable swoolg pg test * Update linux-x86_64.yml --------- Co-authored-by: Tianfeng.Han <rango@swoole.com> * v6 cygwin 环境禁用 opcache (#760) * 默认下载的 swoole-cli 版本由 v5.13.0 升级为 v5.1.4.0 (#759) * 升级下载 swoole-cli 默认版本为 v5.1.4.0 * update * Feature test swoole pg (#758) * test v6 swoole pdo_pgsql * test * test * update swoole PGSQL Test * Optimize code * Optimize cygwin scripts * fix * Update ext-swoole * add liburing io_uring library (#700) * 更新 quickstart 脚本 (#766) * 更新 quickstart 脚本 * update quickstart script * update quickstart script * 调整 github aciton macos workflow (#764) * 调整 github aciton macos workflow * optimize code * 更新下载源码包(all-deps.zip) 集合 hash 签名 (#768) * 更新下载源码包集合 hash 签名 * update * update sync-source-code.php (#763) * 调整 uuid 扩展依赖库命名 (#771) * Optimize gettext * Optimize code. default enable gettext, intl, uuid * Upgrade mongodb to 1.19.4, Fix macOS * Remove gettext, intl, uuid extensions because they cannot be supported on macOS. Optimize directory name. * update extensions.md (#780) * 删除 multistage-build-dependencies-container , 此功能由 build-export-container.sh 脚本代替 (#778) * optimzie * 移除提前构建依赖容器脚本, 此功能由 build-export-container.sh 脚本代替 * fix uuid gettext config error (#776) * update setup php swoole-cli runtime (#784) * update workflow (#772) * dockerfile 和 dockerfile-arm64 合并为一个 (#777) * 使用 tini 正确地回收其子进程 * format bash script * 合并dockerfile dockerfile-arm64 * 自动指定构建容器的架构 * 构建容器指定架构 * 添加开放原子容器镜像解决拉取基础镜像超时 (#767) * 添加开放原子容器镜像解决拉取基础镜像超时 * update * fix script error * update make.sphp * 1. 修复 libxml2, libxslt URL 2. 删除 docker build --progress=plain 参数，非通用参数，部分 docker 版本不支持 3. 修复 PHP 8.4 支持 4. 为 make.sh 添加可执行属性 * Fix mongodb extension build error (#788) * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * fix readline not work (#802) * Feature optimize code for macOS builder (#792) * optimize code * macos x86_64 with macOS 13 * update macos workflow config * update macos-init.sh * update macos-init.sh * update macos-init.sh * 更新 swoole 至最新 * 修复 macos 编译出错的问题 --filter=[macos-aarch64][macos-x86_64] * update composer.json * with swoole v5.1.x * 设置加载 php.ini 默认目录 (#812) * 拉取 main 分支代码 * update prepare.php (#813) * Fix sync source code (#798) * fix bug sync-source-code.php * fix bug sync-source-code.php * fix sync-source-code * update sync-source-code.php * fix readline not work * update sync-source-code.php * update sync-source-code.php * update sync-source-code.php * update sync-source-code.php for fpm * update prepare.php * update sync-source-code.php for fpm * set swoole version v5.1.5 --------- Co-authored-by: Tianfeng.Han <rango@swoole.com>
swoole · Oct 29, 2024 · bea0c8c · bea0c8c
1 parent 548e4c5
commit bea0c8c
Show file tree

Hide file tree

Showing 60 changed files with 824 additions and 1,199 deletions.
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   linux-aarch64:
-    if: 1
+    if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[linux-aarch64]')"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -129,7 +129,7 @@ jobs:
             composer install  --no-interaction --no-autoloader --no-scripts --profile
             composer dump-autoload --optimize --profile
 
-            php prepare.php +inotify +apcu +ds +xlswriter +ssh2  --with-swoole-pgsql=1 --with-libavif=1
+            php prepare.php
 
             bash make.sh all-library
 

diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   linux-x86_64:
-    if: 1
+    if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[linux-x86_64]')"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -115,7 +115,7 @@ jobs:
             composer install  --no-interaction --no-autoloader --no-scripts --profile
             composer dump-autoload --optimize --profile
 
-            php prepare.php  +inotify +apcu +ds +xlswriter +ssh2  --with-swoole-pgsql=1
+            php prepare.php
 
             bash ./make.sh all-library
 

diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   macos-aarch64:
-    if: 1
+    if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[macos-aarch64]')"
     runs-on: macos-14
     # macos-latest (macos-14)  变更了 CPU 架构，由 x86_64 变更为 arm64
     # macos-14 CPU 架构 arm64
@@ -14,32 +14,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Prepare build environment
+      - name: Show Environment Info
         run: |
           set -x
           uname -s
           uname -m
           uname -r
           env
           echo $HOME
+          sw_vers
+          xcodebuild -version
           brew config
-
-          bash sapi/quickstart/macos/macos-init.sh
-
-          # sudo rm -rf /Library/Developer/CommandLineTools
-          # xcode-select --install
-
-          # sudo xcode-select --reset
-          # sudo xcode-select -switch /Library/Developer/CommandLineTools
-
-          # softwareupdate --list --verbose
-          # softwareupdate --install -a
-          # xcode-select --install
-
-          # export SDKROOT=$(xcrun --show-sdk-path)
+          xcrun --show-sdk-path
           ls -lh $(xcrun --show-sdk-path)
-          # sudo  xcode-select --switch /Applications/Xcode.app
-          # export MACOSX_DEPLOYMENT_TARGET=12.6
 
           ifconfig
           export IPV6=$(ifconfig en0  | grep "inet6 " | grep -v "inet6 fe80:" | awk '{print $2}' | cut -d'/' -f1 | sed -n '2p')
@@ -49,6 +36,10 @@ jobs:
           echo "X_IPV6=${IPV6}" >> $GITHUB_ENV
           echo "X_IPV4=${IPV4}" >> $GITHUB_ENV
 
+      - name: Prepare Build Environment
+        run: |
+          bash sapi/quickstart/macos/macos-init.sh
+
           export PATH="/opt/homebrew/opt/libtool/bin:$PATH"
           ls -lha /opt/homebrew/opt/libtool/bin/
           libtoolize --version
@@ -60,6 +51,7 @@ jobs:
           echo ${CURRENT_USER}
           sudo mkdir -p /usr/local/swoole-cli
           CURRENT_USER=$(whoami) && sudo chown -R ${CURRENT_USER}:staff /usr/local/swoole-cli
+
           git submodule update --init
 
       - name: Cache PHP Runtime
@@ -97,7 +89,7 @@ jobs:
           mkdir -p pool/ext
           mkdir -p bin/runtime
           if [ ! -f bin/runtime/php ] ; then
-              bash  sapi/quickstart/setup-php-runtime.sh --mirror china
+              bash  sapi/quickstart/setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh
           ls -A pool/lib/
@@ -111,7 +103,7 @@ jobs:
           composer install  --no-interaction --no-autoloader --no-scripts --profile
           composer dump-autoload --optimize --profile
 
-          php prepare.php --without-docker=1  +ds +apcu  +xlswriter +ssh2  --with-build-type=release --with-swoole-pgsql=1
+          php prepare.php --without-docker=1
 
       - name: Build
         run: |

diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -4,8 +4,8 @@ on: [ push, pull_request ]
 
 jobs:
   macos-x86_64:
-    if: 1
-    runs-on: macos-12
+    if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[macos-x86_64]')"
+    runs-on: macos-13
     # macos-latest (macos-14)  变更了 CPU 架构，由 x86_64 变更为 arm64
     # macos-14 CPU 架构 arm64
     # macos-13 CPU 架构 x86_64
@@ -14,31 +14,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Prepare build environment
+      - name: Show Environment Info
         run: |
+          set -x
           uname -s
           uname -m
           uname -r
           env
           echo $HOME
+          sw_vers
+          xcodebuild -version
           brew config
-          set -x
-          bash sapi/quickstart/macos/macos-init.sh
-
-          # sudo rm -rf /Library/Developer/CommandLineTools
-          # xcode-select --install
-
-          # sudo xcode-select --reset
-          # sudo xcode-select -switch /Library/Developer/CommandLineTools
-
-          # softwareupdate --list --verbose
-          # softwareupdate --install -a
-          # xcode-select --install
-
-          # export SDKROOT=$(xcrun --show-sdk-path)
+          xcrun --show-sdk-path
           ls -lh $(xcrun --show-sdk-path)
-          # sudo  xcode-select --switch /Applications/Xcode.app
-          # export MACOSX_DEPLOYMENT_TARGET=12.6
 
           ifconfig
           export IPV6=$(ifconfig en0  | grep "inet6 " | grep -v "inet6 fe80:" | awk '{print $2}' | cut -d'/' -f1 | sed -n '2p')
@@ -48,6 +36,10 @@ jobs:
           echo "X_IPV6=${IPV6}" >> $GITHUB_ENV
           echo "X_IPV4=${IPV4}" >> $GITHUB_ENV
 
+      - name: Prepare Build Environment
+        run: |
+          bash sapi/quickstart/macos/macos-init.sh
+
           export PATH=/usr/local/opt/libtool/bin:$PATH
           ls -lha /usr/local/opt/libtool/bin/
 
@@ -59,6 +51,7 @@ jobs:
           echo ${CURRENT_USER}
           sudo mkdir -p /usr/local/swoole-cli
           CURRENT_USER=$(whoami) && sudo chown -R ${CURRENT_USER}:staff /usr/local/swoole-cli
+
           git submodule update --init
 
       - name: Cache PHP Runtime
@@ -110,7 +103,7 @@ jobs:
           composer install  --no-interaction --no-autoloader --no-scripts --profile
           composer dump-autoload --optimize --profile
 
-          php prepare.php --without-docker=1  +ds +apcu  +xlswriter +ssh2  --with-build-type=release
+          php prepare.php --without-docker=1
 
       - name: Build
         run: |

diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml
@@ -4,7 +4,7 @@ on: [ push, pull_request ]
 
 jobs:
   windows-cygwin:
-    if: 1
+    if: "!contains(github.event.head_commit.message, '--filter=') || contains(github.event.head_commit.message, '[windows-cygwin]')"
     runs-on: windows-latest
     steps:
       - name: Prepare git

diff --git a/.gitignore b/.gitignore
@@ -312,6 +312,7 @@ tmp-php.ini
 /ext/loader8
 /ext/ds
 /ext/xlswriter
+/ext/uuid
 /.phpunit.result.cache
 /samples/sfx/*.phar
 .php-cs-fixer.cache

diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c
@@ -756,6 +756,7 @@ TSRM_API void *tsrm_get_ls_cache(void)
 	return tsrm_tls_get();
 }/*}}}*/
 
+#ifdef HAVE_JIT
 /* Returns offset of tsrm_ls_cache slot from Thread Control Block address */
 TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 {/*{{{*/
@@ -795,6 +796,7 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 	return 0;
 #endif
 }/*}}}*/
+#endif
 
 TSRM_API uint8_t tsrm_is_main_thread(void)
 {/*{{{*/

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
@@ -132,7 +132,9 @@ TSRM_API void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread
 TSRM_API void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
 TSRM_API void *tsrm_get_ls_cache(void);
+#ifdef HAVE_JIT
 TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void);
+#endif
 TSRM_API uint8_t tsrm_is_main_thread(void);
 TSRM_API uint8_t tsrm_is_shutdown(void);
 TSRM_API const char *tsrm_api_name(void);