Merge pull request #648 from jingjingxyk/experiment-webui

Experiment 同步主分支
swoole · Jun 7, 2024 · 96f5dd5 · 96f5dd5
2 parents 1b88b56 + 8fa6161
commit 96f5dd5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -66,6 +66,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

diff --git a/build-release-example.sh b/build-release-example.sh
@@ -14,6 +14,10 @@ fi
 
 cd ${__PROJECT__}
 
+if [ ! -d ext/swoole/.git ] ; then
+  git submodule update --init --recursive
+fi
+
 set -x
 
 # shellcheck disable=SC2034
@@ -49,9 +53,9 @@ MIRROR=''
 
 # 依赖库默认安装目录
 LIBRARY_INSTALL_PREFIX=/usr/local/swoole-cli
-
 OPTIONS=''
 
+
 while [ $# -gt 0 ]; do
   case "$1" in
   --mirror)
@@ -97,7 +101,7 @@ done
 # 构建环境依赖检查
 CMDS_NUMS=0
 CMDS=("flex" "pkg-config" "cmake" "re2c" "bison" "curl" "automake" "libtool" "clang" "xz" "zip" "unzip" "autoconf")
-CMDS_ARRAY_LEN=${#CMDS[@]}
+CMDS_LEN=${#CMDS[@]}
 for cmd in "${CMDS[@]}"; do
     if command -v "$cmd" >/dev/null 2>&1; then
         # echo "$cmd exists"
@@ -108,7 +112,7 @@ done
 if [ "$OS" = 'linux' ] ; then
     if [ -f /.dockerenv ]; then
         IN_DOCKER=1
-        if test $CMDS_ARRAY_LEN -ne $CMDS_NUMS ;then
+        if test $CMDS_LEN -ne $CMDS_NUMS ;then
         {
             if [ "$MIRROR" = 'china' ] ; then
                 sh sapi/quickstart/linux/alpine-init.sh --mirror china
@@ -130,7 +134,7 @@ if [ "$OS" = 'linux' ] ; then
 fi
 
 if [ "$OS" = 'macos' ] ; then
-  if test $CMDS_ARRAY_LEN -ne $CMDS_NUMS ; then
+  if test $CMDS_LEN -ne $CMDS_NUMS ; then
   {
         if [ "$MIRROR" = 'china' ] ; then
             bash sapi/quickstart/macos/macos-init.sh --mirror china

diff --git a/sapi/quickstart/setup-php-runtime.sh b/sapi/quickstart/setup-php-runtime.sh
@@ -5,18 +5,10 @@ __DIR__=$(
   cd "$(dirname "$0")"
   pwd
 )
-if [ -f ${__DIR__}/prepare.php ] ; then
-  __PROJECT__=$(
-    cd ${__DIR__}/
-    pwd
-  )
-else
-  __PROJECT__=$(
-    cd ${__DIR__}/../../
-    pwd
-  )
-fi
-
+__PROJECT__=$(
+  cd ${__DIR__}/../../
+  pwd
+)
 cd ${__PROJECT__}
 
 bash ${__PROJECT__}/setup-php-runtime.sh "$@"
diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php
@@ -5,7 +5,7 @@
 
 return function (Preprocessor $p) {
 
-    $swoole_tag = 'v5.1.2';
+    $swoole_tag = 'v5.1.3';
     $file = "swoole-{$swoole_tag}.tar.gz";
 
     $url = "https://github.com/swoole/swoole-src/archive/refs/tags/{$swoole_tag}.tar.gz";
@@ -46,4 +46,7 @@
 
     $libs = $p->isMacos() ? '-lc++' : ' -lstdc++ ';
     $p->withVariable('LIBS', '$LIBS ' . $libs);
+
+    $p->withExportVariable('CARES_CFLAGS', '$(pkg-config  --cflags --static  libcares)');
+    $p->withExportVariable('CARES_LIBS', '$(pkg-config    --libs   --static  libcares)');
 };