v5.1.x 拉取 main 分支

.github/workflows/artifact-hash.yml

@@ -16,7 +16,6 @@ on:
 jobs:
   generate-artifact-hash:
     runs-on: ubuntu-latest
-    if: 0
     steps:
       - uses: actions/checkout@v4
       - name: Show Release File Hash

.github/workflows/auto-cache-pool-tarball.yml

@@ -5,10 +5,11 @@ on:
   pull_request:
   schedule:
     - cron: '0 0 */6 * *'
+  workflow_dispatch:
 
 jobs:
   auto-cache-pool:
-    if: 1
+    if: ${{ (github.repository_owner == 'swoole') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -70,25 +71,26 @@ jobs:
           set -x
           mkdir -p pool/lib
           mkdir -p pool/ext
-          mkdir -p bin/runtime
-          if [ ! -f bin/runtime/php ] ; then
+          mkdir -p runtime/
+          test -f runtime/php && rm -f runtime/php
+          if [ ! -f runtime/php/php ] ; then
               bash  setup-php-runtime.sh
           fi
 
-          ls -A pool/lib/
           WORK_DIR=${{ github.workspace }}
-          uname -m
-          export PATH=${WORK_DIR}/bin/runtime:$PATH
-          alias php="php -d curl.cainfo=${WORK_DIR}/bin/runtime/cacert.pem -d openssl.cafile=${WORK_DIR}/bin/runtime/cacert.pem"
+          export PATH=${WORK_DIR}/runtime/php/:$PATH
+          alias php="php -d curl.cainfo=${WORK_DIR}/runtime/php/cacert.pem -d openssl.cafile=${WORK_DIR}/runtime/php/cacert.pem"
 
           composer install  --no-interaction --no-autoloader --no-scripts --profile
           composer dump-autoload --optimize --profile
 
-          php prepare.php  +inotify +apcu +ds +xlswriter +ssh2  +uuid --show-tarball-hash=1
-          php prepare.php           +apcu +ds +xlswriter +ssh2  +uuid @macos --show-tarball-hash=1
+          php prepare.php  +inotify +apcu +ds +ssh2  +uuid +protobuf +gettext --with-libavif=1 --show-tarball-hash=1
+          php prepare.php           +apcu +ds +ssh2  +uuid +protobuf +gettext --with-libavif=1 --show-tarball-hash=1 @macos
+          php sapi/scripts/download-php-src-archive.php
 
+          echo 'cygwin: https://www.cygwin.com/COPYING' >> bin/LICENSE
           cd ${{ github.workspace }}/pool/
-          zip -9 -r ${WORK_DIR}/all-deps.zip ext lib
+          zip -9 -r ${WORK_DIR}/all-deps.zip ext lib php-tar
           HASH=$(sha256sum ${WORK_DIR}/all-deps.zip | awk '{print $1}')
           echo " all-deps.zip sha265: ${HASH} "
           echo -n ${HASH} > ${WORK_DIR}/all-deps.zip.sha256sum
@@ -98,6 +100,8 @@ jobs:
         run: |
           ls -A pool/lib/
           ls -A pool/ext/
+          ls -A pool/php-tar/
+          cat bin/LICENSE
 
       - name: production artifacts
         uses: actions/upload-artifact@v4
@@ -107,6 +111,7 @@ jobs:
           path: |
             all-deps.zip
             all-deps.zip.sha256sum
+            bin/LICENSE
 
       - name: gh release
         uses: softprops/action-gh-release@v2
@@ -115,3 +120,4 @@ jobs:
           files: |
             all-deps.zip
             all-deps.zip.sha256sum
+            bin/LICENSE

.github/workflows/linux-aarch64.yml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/cache@v4
         id: php-runtime-cache-aarch64
         with:
-          path: ${{ github.workspace }}/bin/runtime
+          path: ${{ github.workspace }}/runtime
           key: ${{ runner.os }}-aarch64-php-runtime
 
       - name: Cache PHP Vendor
@@ -92,8 +92,10 @@ jobs:
           set -x
           mkdir -p pool/lib
           mkdir -p pool/ext
-          mkdir -p bin/runtime
-          if [ ! -f bin/runtime/php ] ; then
+          mkdir -p bin/
+          mkdir -p runtime/
+          test -f runtime/php && rm -f runtime/php
+          if [ ! -f runtime/php/php ] ; then
               bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh
@@ -108,20 +110,20 @@ jobs:
           run: |
             set -eux
             uname -m
-            export PATH=/work/bin/runtime:$PATH  # 容器已经内置 php 和 composer
-            alias php="php -d curl.cainfo=/work/bin/runtime/cacert.pem -d openssl.cafile=/work/bin/runtime/cacert.pem"
+            export PATH=/work/runtime/php/:$PATH  # 容器已经内置 php 和 composer
+            alias php="php -d curl.cainfo=/work/runtime/php/cacert.pem -d openssl.cafile=/work/runtime/php/cacert.pem"
 
             sh  sapi/quickstart/linux/alpine-init.sh
             composer install  --no-interaction --no-autoloader --no-scripts --profile
             composer dump-autoload --optimize --profile
 
             php prepare.php
 
-            bash ./make.sh all-library
+            bash make.sh all-library
 
-            bash ./make.sh config
-            bash ./make.sh build
-            bash ./make.sh archive
+            bash make.sh config
+            bash make.sh build
+            bash make.sh archive
 
       - name: Show Build Result
         run: |

.github/workflows/linux-x86_64.yml

@@ -48,7 +48,7 @@ jobs:
         uses: actions/cache@v4
         id: php-runtime-cache-x86_64
         with:
-          path: ${{ github.workspace }}/bin/runtime
+          path: ${{ github.workspace }}/runtime
           key: ${{ runner.os }}-x86_64-php-runtime
 
       - name: Cache PHP Vendor
@@ -92,8 +92,10 @@ jobs:
           set -x
           mkdir -p pool/lib
           mkdir -p pool/ext
-          mkdir -p bin/runtime
-          if [ ! -f bin/runtime/php ] ; then
+          mkdir -p bin/
+          mkdir -p runtime/
+          test -f runtime/php && rm -f runtime/php
+          if [ ! -f runtime/php/php ] ; then
               bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh
@@ -108,20 +110,20 @@ jobs:
           run: |
             set -eux
             uname -m
-            export PATH=/work/bin/runtime:$PATH  # 容器已经内置 php 和 composer
-            alias php="php -d curl.cainfo=/work/bin/runtime/cacert.pem -d openssl.cafile=/work/bin/runtime/cacert.pem"
+            export PATH=/work/runtime/php:$PATH  # 容器已经内置 php 和 composer
+            alias php="php -d curl.cainfo=/work/runtime/php/cacert.pem -d openssl.cafile=/work/runtime/php/cacert.pem"
 
             sh  sapi/quickstart/linux/alpine-init.sh
             composer install  --no-interaction --no-autoloader --no-scripts --profile
             composer dump-autoload --optimize --profile
 
             php prepare.php
 
-            bash ./make.sh all-library
+            bash make.sh all-library
 
-            bash ./make.sh config
-            bash ./make.sh build
-            bash ./make.sh archive
+            bash make.sh config
+            bash make.sh build
+            bash make.sh archive
 
       - name: Start Database
         run: |
@@ -136,14 +138,14 @@ jobs:
           ./bin/swoole-cli -m
           ./bin/swoole-cli --ri gd
           ./bin/swoole-cli --ri swoole
+          ldd ./bin/swoole-cli
           file ./bin/swoole-cli
           readelf -h ./bin/swoole-cli
           APP_VERSION=$(./bin/swoole-cli  -v | awk '{print $2}')
           echo "APP_VERSION=${APP_VERSION}" >> $GITHUB_ENV
           ./bin/swoole-cli -r "echo PHP_VERSION;"
           ./bin/swoole-cli ./vendor/bin/phpunit ./sapi/src/UnitTest/MainTest.php  --list-tests
           ./bin/swoole-cli ./vendor/bin/phpunit ./sapi/src/UnitTest/MainTest.php
-          ./bin/swoole-cli ./vendor/bin/phpunit ./sapi/src/UnitTest/SwoolePGSQLTest.php
 
       - name: production artifacts debug
         uses: actions/upload-artifact@v4

.github/workflows/macos-aarch64.yml

@@ -58,7 +58,7 @@ jobs:
         uses: actions/cache@v4
         id: php-runtime-cache
         with:
-          path: ${{ github.workspace }}/bin/runtime
+          path: ${{ github.workspace }}/runtime
           key: ${{ runner.os }}-aarch64-php-runtime
 
       - name: Cache PHP Vendor
@@ -87,18 +87,20 @@ jobs:
           set -x
           mkdir -p pool/lib
           mkdir -p pool/ext
-          mkdir -p bin/runtime
-          if [ ! -f bin/runtime/php ] ; then
-              bash  sapi/quickstart/setup-php-runtime.sh
+          mkdir -p bin/
+          mkdir -p runtime/
+          test -f runtime/php && rm -f runtime/php
+          if [ ! -f runtime/php/php ] ; then
+              bash  setup-php-runtime.sh
           fi
           bash sapi/download-box/download-box-get-archive-from-server.sh
           ls -A pool/lib/
           ls -A /usr/local/swoole-cli/
 
       - name: prepare
         run: |
-          export PATH=${{ github.workspace }}/bin/runtime:$PATH
-          alias php="php -d curl.cainfo=${{ github.workspace }}/bin/runtime/cacert.pem -d openssl.cafile=${{ github.workspace }}/bin/runtime/cacert.pem"
+          export PATH=${{ github.workspace }}/runtime/php/:$PATH
+          alias php="php -d curl.cainfo=${{ github.workspace }}/runtime/php/cacert.pem -d openssl.cafile=${{ github.workspace }}/runtime/php/cacert.pem"
 
           composer install  --no-interaction --no-autoloader --no-scripts --profile
           composer dump-autoload --optimize --profile
@@ -107,13 +109,13 @@ jobs:
 
       - name: Build
         run: |
-          export PATH=${{ github.workspace }}/bin/runtime:$PATH
+          export PATH=${{ github.workspace }}/runtime/php/:$PATH
 
-          bash ./make.sh all-library
+          bash make.sh all-library
 
-          bash ./make.sh config
-          bash ./make.sh build
-          bash ./make.sh archive
+          bash make.sh config
+          bash make.sh build
+          bash make.sh archive
 
       - name: Show Build Result
         run: |