fix bug (#870)

swoole · Dec 16, 2024 · 25c6b09 · 25c6b09
1 parent b8cfa40
commit 25c6b09
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/ext/swoole b/ext/swoole
diff --git a/sapi/scripts/generate-artifact-hash.sh b/sapi/scripts/generate-artifact-hash.sh
@@ -113,7 +113,7 @@ APP_DOWNLOAD_URL="https://github.com/swoole/swoole-cli/releases/download/${VERSI
 
 APP_RUNTIME="${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}"
 test -f ${APP_RUNTIME}.zip || curl -LSo ${APP_RUNTIME}.zip ${APP_DOWNLOAD_URL}
-test -f all-deps.zip || curl -LSo all-deps.zip https://github.com/swoole/swoole-cli/releases/download/v5.1.5.1/all-deps.zip
+test -f all-deps.zip || curl -LSo all-deps.zip https://github.com/swoole/swoole-cli/releases/download/${VERSION}/all-deps.zip
 
 ls -p | grep -v '/$' | xargs sha256sum
 

diff --git a/setup-swoole-cli-runtime.sh b/setup-swoole-cli-runtime.sh
@@ -74,8 +74,14 @@ while [ $# -gt 0 ]; do
       X_VERSION=$(echo "$2" | grep -E '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
       X_APP_VERSION=$(echo "$2" | grep -Eo '^v\d\.\d{1,2}\.\d{1,2}')
     elif [ $OS = "linux" ]; then
-      X_VERSION=$(echo "$2" | grep -P '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
-      X_APP_VERSION=$(echo "$2" | grep -Po '^v\d\.\d{1,2}\.\d{1,2}')
+      OS_RELEASE=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '\n' | tr -d '\"')
+      if [ "$OS_RELEASE" = 'alpine' ]; then
+        X_VERSION=$(echo "$2" | grep -E '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
+        X_APP_VERSION=$(echo "$2" | grep -Eo '^v\d\.\d{1,2}\.\d{1,2}')
+      else
+        X_VERSION=$(echo "$2" | grep -P '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
+        X_APP_VERSION=$(echo "$2" | grep -Po '^v\d\.\d{1,2}\.\d{1,2}')
+      fi
     else
       X_VERSION=''
       X_APP_VERSION=''
+1 −1		CMakeLists.txt
+7 −3		config.m4
+9 −0		core-tests/src/coroutine/system.cpp
+39 −32		core-tests/src/os/wait.cpp
+108 −0		docs/CHANGELOG.md
+8 −0		ext-src/php_swoole.cc
+36 −15		ext-src/php_swoole_cxx.h
+36 −28		ext-src/php_swoole_library.h
+1 −1		ext-src/stubs/php_swoole_runtime.stub.php
+1 −2		ext-src/stubs/php_swoole_runtime_arginfo.h
+14 −44		ext-src/swoole_coroutine_system.cc
+0 −4		ext-src/swoole_http_request.cc
+1 −1		ext-src/swoole_odbc.cc
+1 −1		ext-src/swoole_oracle.cc
+1 −1		ext-src/swoole_pgsql.cc
+116 −89		ext-src/swoole_runtime.cc
+1 −1		ext-src/swoole_sqlite.cc
+1 −0		include/swoole_coroutine.h
+6 −0		include/swoole_coroutine_system.h
+1 −1		include/swoole_version.h
+101 −17		package.xml
+45 −2		src/coroutine/system.cc
+21 −3		src/os/wait.cc
+1 −1		tests/include/config.php
+9 −1		tests/swoole_coroutine/cancel/wait.phpt
+1 −1		tests/swoole_pdo_oracle/bug44301.phpt
+1 −1		tests/swoole_pdo_oracle/bug_33707.phpt
+3 −3		tests/swoole_runtime/base.phpt
+16 −14		tests/swoole_runtime/file_hook/bug_4327.phpt
+0 −2		tests/swoole_thread/pipe.phpt
+5 −5		tests/swoole_thread/shell_exec.phpt
+11 −6		thirdparty/php/standard/proc_open.cc