Merge pull request #954 from jingjingxyk/build_native_php

jingjingxyk · web-flow · commit d0e4c1744da0 · 2025-04-26T08:30:15.000+08:00
Build native php
diff --git a/.github/workflows/artifact-hash.yml b/.github/workflows/artifact-hash.yml
@@ -6,7 +6,7 @@ on:
       version:
         required: true
         description: "发版 版本号 tag"
-        default: 'v1.9.1'
+        default: 'v1.9.2'
         type: string
       php-version:
         required: true
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Show Release File Hash
         run: |
-          bash sapi/scripts/generate-artifact-hash.sh --version ${{ inputs.version }} --php-version ${{ inputs.php-version }}
+          bash sapi/scripts/generate-artifact-hash.sh --version ${{ inputs.version }} --with-php-versions ${{ inputs.php-version }}
 
       - name: production artifacts
         uses: actions/upload-artifact@v4
diff --git a/sapi/download-box/download-box-get-archive-from-server.sh b/sapi/download-box/download-box-get-archive-from-server.sh
@@ -22,8 +22,8 @@ if [ -f "${__PROJECT__}/sapi/PHP-VERSION.conf" ]; then
   DOMAIN='https://github.com/swoole/swoole-cli/releases/download/v6.0.0.0/'
   ALL_DEPS_HASH="a55699ecee994032f33266dfa37eabb49f1f6d6b6b65cdcf7b881cac09c63bea"
 else
-  DOMAIN='https://github.com/swoole/build-static-php/releases/download/v1.6.0/'
-  ALL_DEPS_HASH="771f8c695477be93da10847f3051fb054f0f829b242300e1ae2126b67f338664"
+  DOMAIN='https://github.com/swoole/build-static-php/releases/download/v1.9.2/'
+  ALL_DEPS_HASH="4e840ca7d9fb2342a7d459282c7e403921a892ed4eebea4b1a6db48d790bf1ee"
 fi
 
 while [ $# -gt 0 ]; do
@@ -47,6 +47,10 @@ URL="${DOMAIN}/all-deps.zip"
 
 test -f all-deps.zip || curl -fSLo all-deps.zip ${URL}
 
+# https://www.runoob.com/linux/linux-comm-unzip.html
+# -o 不必先询问用户，unzip执行后覆盖原有文件。
+# -n 解压缩时不要覆盖原有的文件。
+
 # hash 签名
 HASH=$(sha256sum all-deps.zip | awk '{print $1}')
 
@@ -62,9 +66,11 @@ fi
 
 unzip -n all-deps.zip
 
+
 cd ${__PROJECT__}/
 
 awk 'BEGIN { cmd="cp -ri var/download-box/lib/* pool/lib"  ; print "n" |cmd; }'
 awk 'BEGIN { cmd="cp -ri var/download-box/ext/* pool/ext"; print "n" |cmd; }'
 
+
 echo "download all-archive.zip ok ！"
diff --git a/sapi/scripts/generate-artifact-hash.sh b/sapi/scripts/generate-artifact-hash.sh
@@ -13,6 +13,7 @@ __PROJECT__=$(
 cd ${__PROJECT__}
 
 OS=$(uname -s)
+ARCH=$(uname -m)
 case $OS in
 'Linux')
   OS="linux"
@@ -36,9 +37,23 @@ case $OS in
   ;;
 esac
 
+case $ARCH in
+'x86_64')
+  ARCH="x64"
+  ;;
+'aarch64' | 'arm64')
+  ARCH="arm64"
+  ;;
+*)
+  echo '暂未配置的 ARCH '
+  exit 0
+  ;;
+esac
+
 APP_VERSION='v8.3.19'
 APP_NAME='php-cli'
-VERSION='v1.9.1'
+VERSION='v1.9.2'
+PHP_VERSIONS=""
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -103,6 +118,13 @@ while [ $# -gt 0 ]; do
       }
     fi
     ;;
+  --with-php-versions)
+    OLD_IFS=$IFS
+    IFS=','
+    read -r -a PHP_VERSIONS <<<"$2"
+    IFS=$OLD_IFS
+    echo "${PHP_VERSIONS[@]}"
+    ;;
   --*)
     echo "Illegal option $1"
     exit 0
@@ -127,14 +149,6 @@ UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME() {
   test -f ${APP_RUNTIME}.tar.xz || curl -fSLo ${APP_RUNTIME}.tar.xz ${APP_DOWNLOAD_URL}
 }
 
-UNIX_DOWNLOAD() {
-  APP_VERSION="$1"
-  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "linux" "x64" "${APP_VERSION}"
-  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "linux" "arm64" "${APP_VERSION}"
-  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "macos" "x64" "${APP_VERSION}"
-  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "macos" "arm64" "${APP_VERSION}"
-}
-
 WINDOWS_DOWNLOAD_SWOOLE_CLIE_RUNTIME() {
   APP_VERSION="$1"
   ARCH="x64"
@@ -143,31 +157,39 @@ WINDOWS_DOWNLOAD_SWOOLE_CLIE_RUNTIME() {
   APP_RUNTIME="${APP_NAME}-${APP_VERSION}-cygwin-${ARCH}"
   test -f ${APP_RUNTIME}.zip || curl -fSLo ${APP_RUNTIME}.zip ${APP_DOWNLOAD_URL}
 }
-WINDOWS_DOWNLOAD() {
-  WINDOWS_DOWNLOAD_SWOOLE_CLIE_RUNTIME "$1"
-}
 
-RUN_DOWNLOAD() {
-  UNIX_DOWNLOAD "$1"
-  WINDOWS_DOWNLOAD "$1"
+UNIX_DOWNLOAD() {
+  APP_VERSION="$1"
+  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "linux" "x64" "${APP_VERSION}"
+  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "linux" "arm64" "${APP_VERSION}"
+  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "macos" "x64" "${APP_VERSION}"
+  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "macos" "arm64" "${APP_VERSION}"
 }
 
 DOWNLOAD() {
   declare -A PHP_VERSIONS
-  PHP_VERSIONS[0]="v8.2.27"
-  PHP_VERSIONS[1]="v8.1.31"
-  PHP_VERSIONS[2]="v8.3.15"
-  PHP_VERSIONS[3]="v8.4.2"
+  PHP_VERSIONS[0]="v8.2.28"
+  PHP_VERSIONS[1]="v8.1.32"
+  PHP_VERSIONS[2]="v8.3.19"
+  PHP_VERSIONS[3]="v8.4.5"
   for i in "${!PHP_VERSIONS[@]}"; do
     # echo ${PHP_VERSIONS[$i]}
-    RUN_DOWNLOAD "${PHP_VERSIONS[$i]}"
+    UNIX_DOWNLOAD "${PHP_VERSIONS[$i]}"
+    WINDOWS_DOWNLOAD_SWOOLE_CLIE_RUNTIME "${PHP_VERSIONS[$i]}"
   done
-
 }
 
-test -f all-deps.zip || curl -fSLo all-deps.zip https://github.com/swoole/build-static-php/releases/download/${VERSION}/all-deps.zip
-
-DOWNLOAD
+if [ -n "$PHP_VERSIONS" ]; then
+  for i in "${!PHP_VERSIONS[@]}"; do
+    # echo ${PHP_VERSIONS[$i]}
+    # RUN_DOWNLOAD "${PHP_VERSIONS[$i]}"
+    UNIX_DOWNLOAD "${PHP_VERSIONS[$i]}"
+    WINDOWS_DOWNLOAD_SWOOLE_CLIE_RUNTIME "${PHP_VERSIONS[$i]}"
+  done
+  test -f all-deps.zip || curl -fSLo all-deps.zip https://github.com/swoole/build-static-php/releases/download/${VERSION}/all-deps.zip
+else
+  UNIX_DOWNLOAD_SWOOLE_CLIE_RUNTIME "${OS}" "${ARCH}" "${APP_VERSION}"
+fi
 
 ls -p | grep -v '/$' | xargs sha256sum
 
diff --git a/setup-php-cli-runtime.sh b/setup-php-cli-runtime.sh
@@ -6,7 +6,7 @@ __DIR__=$(
   pwd
 )
 __PROJECT__=${__DIR__}
-
+shopt -s expand_aliases
 cd ${__PROJECT__}
 
 OS=$(uname -s)
@@ -50,10 +50,15 @@ esac
 
 APP_VERSION='v8.2.28'
 APP_NAME='php-cli'
-VERSION='v1.9.0'
+VERSION='v1.9.2'
 
-mkdir -p bin/runtime
+cd ${__PROJECT__}
+mkdir -p runtime/
 mkdir -p var/runtime
+APP_RUNTIME_DIR=${__PROJECT__}/runtime/${APP_NAME}
+mkdir -p ${APP_RUNTIME_DIR}
+
+cd ${__PROJECT__}/var/runtime
 
 MIRROR=''
 while [ $# -gt 0 ]; do
@@ -142,25 +147,24 @@ if [ $OS = 'windows' ]; then
     test -f ${APP_RUNTIME}.zip || curl -LSo ${APP_RUNTIME}.zip ${APP_DOWNLOAD_URL}
     test -d ${APP_RUNTIME} && rm -rf ${APP_RUNTIME}
     unzip "${APP_RUNTIME}.zip"
-    echo
     exit 0
   }
 else
   test -f ${APP_RUNTIME}.tar.xz || curl -LSo ${APP_RUNTIME}.tar.xz ${APP_DOWNLOAD_URL}
   test -f ${APP_RUNTIME}.tar || xz -d -k ${APP_RUNTIME}.tar.xz
   test -f php || tar -xvf ${APP_RUNTIME}.tar
   chmod a+x php
-  cp -f ${__PROJECT__}/var/runtime/php ${__PROJECT__}/bin/runtime/php
+  cp -f ${__PROJECT__}/var/runtime/php ${APP_RUNTIME_DIR}/
 fi
 
 cd ${__PROJECT__}/var/runtime
 
-cp -f ${__PROJECT__}/var/runtime/composer.phar ${__PROJECT__}/bin/runtime/composer
-cp -f ${__PROJECT__}/var/runtime/cacert.pem ${__PROJECT__}/bin/runtime/cacert.pem
+cp -f ${__PROJECT__}/var/runtime/composer.phar ${APP_RUNTIME_DIR}/composer
+cp -f ${__PROJECT__}/var/runtime/cacert.pem ${APP_RUNTIME_DIR}/cacert.pem
 
-cat >${__PROJECT__}/bin/runtime/php.ini <<EOF
-curl.cainfo="${__PROJECT__}/bin/runtime/cacert.pem"
-openssl.cafile="${__PROJECT__}/bin/runtime/cacert.pem"
+cat >${APP_RUNTIME_DIR}/php.ini <<EOF
+curl.cainfo="${APP_RUNTIME_DIR}/cacert.pem"
+openssl.cafile="${APP_RUNTIME_DIR}/cacert.pem"
 swoole.use_shortname=off
 display_errors = On
 error_reporting = E_ALL
@@ -186,10 +190,10 @@ set +x
 echo " "
 echo " USE PHP-CLI RUNTIME :"
 echo " "
-echo " export PATH=\"${__PROJECT__}/bin/runtime:\$PATH\" "
+echo " export PATH=\"${APP_RUNTIME_DIR}:\$PATH\" "
 echo " "
-echo " alias php='php -d curl.cainfo=${__PROJECT__}/bin/runtime/cacert.pem -d openssl.cafile=${__PROJECT__}/bin/runtime/cacert.pem' "
+echo " alias php='php -d curl.cainfo=${APP_RUNTIME_DIR}/cacert.pem -d openssl.cafile=${APP_RUNTIME_DIR}/cacert.pem' "
 echo " OR "
-echo " alias php='php -c ${__PROJECT__}/bin/runtime/php.ini' "
+echo " alias php='php -c ${APP_RUNTIME_DIR}/php.ini' "
 echo " "
 echo " PHP-CLI VERSION  ${APP_VERSION}"
diff --git a/setup-php-fpm-runtime.sh b/setup-php-fpm-runtime.sh
@@ -6,7 +6,7 @@ __DIR__=$(
   pwd
 )
 __PROJECT__=${__DIR__}
-
+shopt -s expand_aliases
 cd ${__PROJECT__}
 
 OS=$(uname -s)
@@ -50,10 +50,7 @@ esac
 
 APP_VERSION='v8.2.28'
 APP_NAME='php-fpm'
-VERSION='php-fpm-v2.1.0'
-
-mkdir -p bin/runtime
-mkdir -p var/runtime
+VERSION='php-fpm-v2.2.0'
 
 MIRROR=''
 while [ $# -gt 0 ]; do
@@ -108,6 +105,12 @@ while [ $# -gt 0 ]; do
   shift $(($# > 0 ? 1 : 0))
 done
 
+cd ${__PROJECT__}
+mkdir -p runtime/
+mkdir -p var/runtime
+APP_RUNTIME_DIR=${__PROJECT__}/runtime/${APP_NAME}
+mkdir -p ${APP_RUNTIME_DIR}
+
 cd ${__PROJECT__}/var/runtime
 
 APP_DOWNLOAD_URL="https://github.com/swoole/build-static-php/releases/download/${VERSION}/${APP_NAME}-${APP_VERSION}-${OS}-${ARCH}.tar.xz"
@@ -142,25 +145,27 @@ if [ $OS = 'windows' ]; then
     test -f ${APP_RUNTIME}.zip || curl -LSo ${APP_RUNTIME}.zip ${APP_DOWNLOAD_URL}
     test -d ${APP_RUNTIME} && rm -rf ${APP_RUNTIME}
     unzip "${APP_RUNTIME}.zip"
-    echo
     exit 0
   }
 else
   test -f ${APP_RUNTIME}.tar.xz || curl -LSo ${APP_RUNTIME}.tar.xz ${APP_DOWNLOAD_URL}
   test -f ${APP_RUNTIME}.tar || xz -d -k ${APP_RUNTIME}.tar.xz
-  test -f php || tar -xvf ${APP_RUNTIME}.tar
-  chmod a+x php
-  cp -f ${__PROJECT__}/var/runtime/php ${__PROJECT__}/bin/runtime/php
+  test -f php-fpm || tar -xvf ${APP_RUNTIME}.tar
+  chmod a+x php-fpm
+  cp -f ${__PROJECT__}/var/runtime/php-fpm ${APP_RUNTIME_DIR}/
+  mkdir -p ${APP_RUNTIME_DIR}/log
+  mkdir -p ${APP_RUNTIME_DIR}/run
+  mkdir -p ${APP_RUNTIME_DIR}/var
 fi
 
 cd ${__PROJECT__}/var/runtime
 
-cp -f ${__PROJECT__}/var/runtime/composer.phar ${__PROJECT__}/bin/runtime/composer
-cp -f ${__PROJECT__}/var/runtime/cacert.pem ${__PROJECT__}/bin/runtime/cacert.pem
+cp -f ${__PROJECT__}/var/runtime/composer.phar ${APP_RUNTIME_DIR}/composer
+cp -f ${__PROJECT__}/var/runtime/cacert.pem ${APP_RUNTIME_DIR}/cacert.pem
 
-cat >${__PROJECT__}/bin/runtime/php.ini <<EOF
-curl.cainfo="${__PROJECT__}/bin/runtime/cacert.pem"
-openssl.cafile="${__PROJECT__}/bin/runtime/cacert.pem"
+cat >${APP_RUNTIME_DIR}/php.ini <<EOF
+curl.cainfo="${APP_RUNTIME_DIR}/cacert.pem"
+openssl.cafile="${APP_RUNTIME_DIR}/cacert.pem"
 swoole.use_shortname=off
 display_errors = On
 error_reporting = E_ALL
@@ -178,7 +183,7 @@ expose_php=Off
 
 EOF
 
-cat >${__PROJECT__}/bin/runtime/php-fpm.conf <<'EOF'
+cat >${APP_RUNTIME_DIR}/php-fpm.conf <<'EOF'
 ; 更多配置参考
 ; https://github.com/php/php-src/blob/master/sapi/fpm/www.conf.in
 ; https://github.com/php/php-src/blob/master/sapi/fpm/php-fpm.conf.in
@@ -216,13 +221,70 @@ EOF
 
 cd ${__PROJECT__}/
 
+tee ${APP_RUNTIME_DIR}/start.sh <<'EOF'
+#!/usr/bin/env bash
+set -exu
+__DIR__=$(
+  cd "$(dirname "$0")"
+  pwd
+)
+cd ${__DIR__}
+mkdir -p log
+mkdir -p run
+mkdir -p var
+
+
+OS=$(uname -s)
+if [ "$OS" = 'Darwin' ]; then
+  # 非 root 设置此项无效
+  USER=$(whoami)
+  GROUP=$(groups $(whoami) | cut -d' ' -f1)
+  # chown -R $(whoami):staff
+  sed -i.bak "s/user = nobody/user = ${USER}/" php-fpm.conf
+  sed -i.bak "s/group = nogroup/group = ${GROUP}/" php-fpm.conf
+  test -f php-fpm.conf.bak && rm -f php-fpm.conf.bak
+fi
+
+${__DIR__}/php-fpm -c ${__DIR__}/php.ini --fpm-config ${__DIR__}/php-fpm.conf -p ${__DIR__}/var
+
+EOF
+
+tee ${APP_RUNTIME_DIR}/reload.sh <<'EOF'
+#!/usr/bin/env bash
+set -exu
+__DIR__=$(
+  cd "$(dirname "$0")"
+  pwd
+)
+cd ${__DIR__}
+
+kill -USR2 $(cat ${__DIR__}/var/run/php-fpm.pid)
+
+EOF
+
+tee ${APP_RUNTIME_DIR}/stop.sh <<'EOF'
+#!/usr/bin/env bash
+set -exu
+__DIR__=$(
+  cd "$(dirname "$0")"
+  pwd
+)
+cd ${__DIR__}
+
+kill -QUIT $(cat ${__DIR__}/var/run/php-fpm.pid)
+
+
+EOF
+
 set +x
 
 echo " "
 echo " USE PHP-FPM :"
 echo " "
-echo " export PATH=\"${__PROJECT__}/runtime/:\$PATH\" "
+echo " export PATH=\"${APP_RUNTIME_DIR}/:\$PATH\" "
+echo " "
+echo " php-fpm.conf example  :  https://gitee.com/jingjingxyk/quickstart-nginx/blob/main/php-fpm.example.conf"
 echo " "
-echo " enable start php-fpm ${APP_VERSION}"
+echo " start php-fpm ${APP_VERSION}"
 echo " "
-echo " ${__PROJECT__}/bin/runtime/php-fpm -c ${__PROJECT__}/bin/runtime/php.ini --fpm-config ${__PROJECT__}/runtime/php-fpm.conf "
+echo " ${APP_RUNTIME_DIR}/php-fpm -c ${APP_RUNTIME_DIR}/php.ini --fpm-config ${APP_RUNTIME_DIR}/php-fpm.conf "
