merge code

Author: jingjingxyk

.github/workflows/linux-aarch64.yml

@@ -14,8 +14,9 @@ jobs:
         php-version:
           - "8.2.29"
           - "8.1.33"
-          - "8.3.23"
-          - "8.4.10"
+          - "8.3.28"
+          - "8.4.15"
+        #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

.github/workflows/linux-x86_64.yml

@@ -51,8 +51,9 @@ jobs:
         php-version:
           - "8.2.29"
           - "8.1.33"
-          - "8.3.23"
-          - "8.4.10"
+          - "8.3.28"
+          - "8.4.15"
+        #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

.github/workflows/macos-aarch64.yml

@@ -18,9 +18,9 @@ jobs:
         php-version:
           - "8.2.29"
           - "8.1.33"
-          - "8.3.23"
-          - "8.4.10"
-
+          - "8.3.28"
+          - "8.4.15"
+        #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

.github/workflows/macos-x86_64.yml

@@ -21,8 +21,9 @@ jobs:
         php-version:
           - "8.2.29"
           - "8.1.33"
-          - "8.3.23"
-          - "8.4.10"
+          - "8.3.28"
+          - "8.4.15"
+        #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

.github/workflows/windows-cygwin.yml

@@ -16,8 +16,9 @@ jobs:
         php-version:
           - "8.2.29"
           - "8.1.33"
-          - "8.3.23"
-          - "8.4.10"
+          - "8.3.28"
+          - "8.4.15"
+        #  - "8.5.0"
     steps:
       - name: Show Environment Info
         shell: cmd
@@ -82,6 +83,7 @@ jobs:
         shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}
         run: |
           bash ./sapi/scripts/cygwin/install-re2c.sh
+          bash sapi/download-box/download-box-get-archive-from-server.sh
 
       - name: install deps lib with source code
         shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}

.github/workflows/windows-msys2.yml

@@ -16,8 +16,9 @@ jobs:
         php-version:
           - "8.2.29"
         #  - "8.1.33"
-          - "8.3.23"
-          - "8.4.10"
+          - "8.3.28"
+          - "8.4.15"
+        #  - "8.5.0"
     steps:
       - name: Show Environment Info
         shell: cmd

sapi/SWOOLE-VERSION.conf

@@ -1 +1 @@
-v6.1.1
+v6.1.3

sapi/download-box/download-box-get-archive-from-server.sh

@@ -17,15 +17,21 @@ mkdir -p pool/ext
 mkdir -p ${__PROJECT__}/var/download-box/
 
 cd ${__PROJECT__}/var/download-box/
+SWOOLE_CLI_RELEASE_VERSION="v6.1.1.1"
+ALL_DEPS_HASH="39983e8b050bfc31265b6c385220026d58ebb04f72cba3ff9f461c97b546e25a"
 
-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/swoole-cli/releases/download/${SWOOLE_CLI_RELEASE_VERSION}/"
+
+# show sha256sum
+# curl -fSL https://github.com/swoole/swoole-cli/releases/download/v6.1.1.1/all-deps.zip.sha256sum && echo
+# download command
+# curl -fSLo all-deps.zip https://github.com/swoole/swoole-cli/releases/download/v6.1.1.1/all-deps.zip
+
+if [ ! -f "${__PROJECT__}/sync-source-code.php" ]; then
   # show sha256sum
-  # curl -LS https://github.com/swoole/build-static-php/releases/download/v1.10.0/all-deps.zip.sha256sum | cat
-  DOMAIN='https://github.com/swoole/build-static-php/releases/download/v1.10.0/'
-  ALL_DEPS_HASH="62681e789de493c6aee51c9b5ad7ee9c37684ac6b2bb867e086f6ca9c70bca44"
+  # curl -fSL https://github.com/swoole/build-static-php/releases/download/v1.11.0/all-deps.zip.sha256sum && echo
+  DOMAIN='https://github.com/swoole/build-static-php/releases/download/v1.11.0/'
+  ALL_DEPS_HASH="6b96e505c066c1a628d05b899edd81b237ce78a617f2c754df227bfcb3a8a4a5"
 fi
 
 DOWNLOAD_ARCHIVE=0
@@ -34,7 +40,7 @@ while [ $# -gt 0 ]; do
   --mirror)
     if [ "$2" = 'china' ]; then
       DOMAIN='https://swoole-cli.jingjingxyk.com/'
-      if [ ! -f "${__PROJECT__}/sapi/PHP-VERSION.conf" ]; then
+      if [ ! -f "${__PROJECT__}/sync-source-code.php" ]; then
         DOMAIN='https://php-cli.jingjingxyk.com/'
       fi
     fi
@@ -48,9 +54,14 @@ while [ $# -gt 0 ]; do
     NO_PROXY="127.0.0.0/8,10.0.0.0/8,100.64.0.0/10,172.16.0.0/12,192.168.0.0/16"
     NO_PROXY="${NO_PROXY},::1/128,fe80::/10,fd00::/8,ff00::/8"
     NO_PROXY="${NO_PROXY},localhost"
-    NO_PROXY="${NO_PROXY},.aliyuncs.com,.aliyun.com,.tencent.com"
+    NO_PROXY="${NO_PROXY},.aliyuncs.com,.aliyun.com"
+    NO_PROXY="${NO_PROXY},.tsinghua.edu.cn,.ustc.edu.cn"
+    NO_PROXY="${NO_PROXY},.tencent.com"
+    NO_PROXY="${NO_PROXY},ftpmirror.gnu.org"
+    NO_PROXY="${NO_PROXY},gitee.com,gitcode.com"
     NO_PROXY="${NO_PROXY},.myqcloud.com,.swoole.com"
-    export NO_PROXY="${NO_PROXY},.tsinghua.edu.cn,.ustc.edu.cn,.npmmirror.com"
+    NO_PROXY="${NO_PROXY},.jingjingxyk.com,jingjingxyk.cn"
+    export NO_PROXY="${NO_PROXY},.npmmirror.com"
     ;;
   --*)
     echo "Illegal option $1"

sapi/src/template/make.php

@@ -354,12 +354,12 @@
     export_variables
     <?php if ($this->isLinux()) : ?>
     export CFLAGS="$CFLAGS  "
-    export LDFLAGS="$LDFLAGS  -static -all-static "
-    <?php if($this->getInputOption('with-static-pie')) : ?>
+    export LDFLAGS="$LDFLAGS  -static -all-static"
+    <?php if ($this->getInputOption('with-static-pie')) : ?>
     export CFLAGS="$CFLAGS  -fPIE"
     export LDFLAGS="$LDFLAGS -static-pie"
-    <?php endif ;?>
-    <?php endif ;?>
+    <?php endif ; ?>
+    <?php endif ; ?>
     export LDFLAGS="$LDFLAGS   <?= $this->extraLdflags ?>"
     export EXTRA_CFLAGS='<?= $this->extraCflags ?>'
     <?php if(!empty($this->httpProxy)) : ?>