Merge pull request #936 from jingjingxyk/build_native_php

jingjingxyk · web-flow · commit 94969d61813f · 2025-03-14T11:58:48.000+08:00
Build native php
diff --git a/.github/workflows/auto-cache-pool-tarball.yml b/.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,7 +71,9 @@ jobs:
           set -x
           mkdir -p pool/lib
           mkdir -p pool/ext
+          mkdir -p pool/php-tar
           mkdir -p bin/runtime
+          mkdir -p bin/var
           if [ ! -f bin/runtime/php ] ; then
               bash  setup-php-runtime.sh
           fi
@@ -84,11 +87,16 @@ jobs:
           composer install  --no-interaction --no-autoloader --no-scripts --profile  --no-dev
           composer dump-autoload --optimize --profile --no-dev
 
-          php prepare.php  +inotify         --show-tarball-hash=1
-          php prepare.php            @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
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.1.32
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.2.28
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.3.19
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.4.5
 
           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 +106,7 @@ jobs:
         run: |
           ls -A pool/lib/
           ls -A pool/ext/
+          ls -A pool/php-tar/
 
       - name: production artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build-alpine-builder-container.sh b/.github/workflows/build-alpine-builder-container.sh
@@ -83,5 +83,41 @@ linux/ppc64le
 linux/s390x
 EOF
 
+# 3.20 开始支持 linux/riscv64
 # 龙芯架构
 # https://cr.loongnix.cn/search
+
+: <<'EOF'
+
+# docker.io/tonistiigi/binfmt:latest
+     "supported": [
+      "linux/amd64",
+      "linux/amd64/v2",
+      "linux/amd64/v3",
+      "linux/arm64",
+      "linux/riscv64",
+      "linux/ppc64le",
+      "linux/s390x",
+      "linux/386",
+      "linux/mips64le",
+      "linux/mips64",
+      "linux/loong64",
+      "linux/arm/v7",
+      "linux/arm/v6"
+    ],
+    "emulators": [
+      "llvm-16-runtime.binfmt",
+      "llvm-17-runtime.binfmt",
+      "llvm-18-runtime.binfmt",
+      "python3.12",
+      "qemu-aarch64",
+      "qemu-arm",
+      "qemu-loongarch64",
+      "qemu-mips64",
+      "qemu-mips64el",
+      "qemu-ppc64le",
+      "qemu-riscv64",
+      "qemu-s390x"
+    ]
+
+EOF
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -3,7 +3,7 @@ name: build-php-cli-linux-aarch64
 on: [ push, pull_request ]
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   linux-aarch64:
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/linux-riscv64.yml b/.github/workflows/linux-riscv64.yml
@@ -76,6 +76,15 @@ jobs:
           ls -A pool/lib/
           ls -A /usr/local/swoole-cli/
 
+      - name: Set up QEMU
+        # Add support for more platforms with QEMU (optional)
+        # https://github.com/docker/setup-qemu-action
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        # 例子： https://github.com/tuna/tunasync-scripts/blob/master/.github/workflows/docker-images.yml#L102
+
       - name: Prepare QEMU
         run: |
           set -x
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -18,12 +18,13 @@ on:
       php_version:
         required: true
         description: "定制构建选项: 指定 PHP 版本(版本号大于等于8.1)"
-        default: '--with-php-version=8.2.27'
+        default: '--with-php-version=8.2.28'
         type: choice
         options:
-          - '--with-php-version=8.1.31'
-          - '--with-php-version=8.2.27'
-          - '--with-php-version=8.3.15'
+          - '--with-php-version=8.1.32'
+          - '--with-php-version=8.2.28'
+          - '--with-php-version=8.3.19'
+          - '--with-php-version=8.4.5'
       build_type:
         required: true
         description: "定制构建选项: 指定构建类型"
@@ -39,7 +40,7 @@ on:
         type: string
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   linux-x86_64:
@@ -48,10 +49,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -3,7 +3,7 @@ name: build-php-cli-macos-aarch64
 on: [ push, pull_request ]
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   macos-aarch64:
@@ -17,10 +17,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   macos-x86_64:
@@ -19,10 +19,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   windows-cygwin:
@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - name: Show Environment Info
         shell: cmd
diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh
@@ -11,8 +11,9 @@ __PROJECT__=$(
 )
 cd ${__PROJECT__}
 
+
 PHP_VERSION='8.2.27'
-SWOOLE_VERSION='v6.0.0'
+SWOOLE_VERSION='v6.0.1'
 X_PHP_VERSION='8.2'
 
 while [ $# -gt 0 ]; do
@@ -47,43 +48,30 @@ mkdir -p ${EXT_TEMP_CACHE_DIR}
 test -d ${WORK_TEMP_DIR}/ext/ && rm -rf ${WORK_TEMP_DIR}/ext/
 mkdir -p ${WORK_TEMP_DIR}/ext/
 
-cd ${__PROJECT__}/pool/ext
-if [ ! -f redis-${REDIS_VERSION}.tgz ]; then
-  curl -fSLo ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz https://pecl.php.net/get/redis-${REDIS_VERSION}.tgz
-  mv ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz ${__PROJECT__}/pool/ext
-fi
-mkdir -p ${WORK_TEMP_DIR}/ext/redis/
-tar --strip-components=1 -C ${WORK_TEMP_DIR}/ext/redis/ -xf redis-${REDIS_VERSION}.tgz
+download_and_extract() {
+  local EXT_NAME=$1
+  local EXT_VERSION=$2
+  local EXT_URL="https://pecl.php.net/get/${EXT_NAME}-${EXT_VERSION}.tgz"
 
-: <<'EOF'
-# mongodb 扩展 不支持 cygwin 环境下构建
-# 详见： https://github.com/mongodb/mongo-php-driver/issues/1381
+  cd ${__PROJECT__}/pool/ext
+  if [ ! -f ${EXT_NAME}-${EXT_VERSION}.tgz ]; then
+    curl -fSLo ${EXT_TEMP_CACHE_DIR}/${EXT_NAME}-${EXT_VERSION}.tgz ${EXT_URL}
+    mv ${EXT_TEMP_CACHE_DIR}/${EXT_NAME}-${EXT_VERSION}.tgz ${__PROJECT__}/pool/ext
+  fi
 
-cd ${__PROJECT__}/pool/ext
-if [ ! -f mongodb-${MONGODB_VERSION}.tgz ]; then
-  curl -fSLo ${EXT_TEMP_CACHE_DIR}/mongodb-${MONGODB_VERSION}.tgz https://pecl.php.net/get/mongodb-${MONGODB_VERSION}.tgz
-  mv ${EXT_TEMP_CACHE_DIR}/redis-${REDIS_VERSION}.tgz ${__PROJECT__}/pool/ext
-fi
-mkdir -p ${WORK_TEMP_DIR}/ext/mongodb/
-tar --strip-components=1 -C ${WORK_TEMP_DIR}/ext/mongodb/ -xf redis-${REDIS_VERSION}.tgz
+  mkdir -p ${WORK_TEMP_DIR}/ext/${EXT_NAME}/
+  tar --strip-components=1 -C ${WORK_TEMP_DIR}/ext/${EXT_NAME}/ -xf ${EXT_NAME}-${EXT_VERSION}.tgz
+}
 
-EOF
+# Download and extract extensions
+download_and_extract "redis" ${REDIS_VERSION}
 
-cd ${__PROJECT__}/pool/ext
-if [ ! -f yaml-${YAML_VERSION}.tgz ]; then
-  curl -fSLo ${EXT_TEMP_CACHE_DIR}/yaml-${YAML_VERSION}.tgz https://pecl.php.net/get/yaml-${YAML_VERSION}.tgz
-  mv ${EXT_TEMP_CACHE_DIR}/yaml-${YAML_VERSION}.tgz ${__PROJECT__}/pool/ext
-fi
-mkdir -p ${WORK_TEMP_DIR}/ext/yaml/
-tar --strip-components=1 -C ${WORK_TEMP_DIR}/ext/yaml/ -xf yaml-${YAML_VERSION}.tgz
+# mongodb 扩展 不支持 cygwin 环境下构建
+# 详见： https://github.com/mongodb/mongo-php-driver/issues/1381
+# download_and_extract "mongodb" ${MONGODB_VERSION}
 
-cd ${__PROJECT__}/pool/ext
-if [ ! -f imagick-${IMAGICK_VERSION}.tgz ]; then
-  curl -fSLo ${EXT_TEMP_CACHE_DIR}/imagick-${IMAGICK_VERSION}.tgz https://pecl.php.net/get/imagick-${IMAGICK_VERSION}.tgz
-  mv ${EXT_TEMP_CACHE_DIR}/imagick-${IMAGICK_VERSION}.tgz ${__PROJECT__}/pool/ext
-fi
-mkdir -p ${WORK_TEMP_DIR}/ext/imagick/
-tar --strip-components=1 -C ${WORK_TEMP_DIR}/ext/imagick/ -xf imagick-${IMAGICK_VERSION}.tgz
+download_and_extract "yaml" ${YAML_VERSION}
+download_and_extract "imagick" ${IMAGICK_VERSION}
 
 cd ${__PROJECT__}/pool/ext
 if [ ! -f swoole-${SWOOLE_VERSION}.tgz ]; then
diff --git a/sapi/scripts/download-php-src-archive.php b/sapi/scripts/download-php-src-archive.php
@@ -3,10 +3,10 @@
 $poject_dir = realpath(__DIR__ . '/../../');
 
 # $php_version_tag = trim(file_get_contents($poject_dir . '/sapi/PHP-VERSION.conf'));
-$php_version_tag = '8.2.23';
+$php_version_tag = '8.2.28';
 $php_source_folder = $poject_dir . "/var/php-{$php_version_tag}";
 $php_archive_file = $poject_dir . "/pool/php-tar/php-{$php_version_tag}.tar.gz";
-$php_archive_file_sha256sum = '9c81202e6397d973c89d162e30ab6fe6689dea9cbbb235be5a5366707a38b649';
+$php_archive_file_sha256sum = 'c1fbad2787ec3e27bf334cb94b2590f47c10f49b5ea1192165a3e91afe838832';
 $download_dir = dirname($php_archive_file);
 $download_php_counter = 0;
 
diff --git a/sapi/src/builder/enabled_extensions.php b/sapi/src/builder/enabled_extensions.php
@@ -37,12 +37,12 @@
     'yaml',
     'imagick',
     'mongodb',
-    //'gettext',
+    'gettext',
     'uuid',
-    //'phpy'
-    'xlswriter',
     'apcu',
     'ds',
     'ssh2',
-    'pgsql'
+    'pgsql',
+    'xlswriter',
+    //'phpy'
 ];
diff --git a/sapi/src/builder/extension/phpy.php b/sapi/src/builder/extension/phpy.php
@@ -11,7 +11,7 @@
     # $options .= ' --with-python-version=3.12';
     # $options .= ' --with-python-dir=/opt/anaconda3';
 
-    $tag = 'v1.0.4';
+    $tag = 'v1.0.11';
 
 
     $python3_prefix = PYTHON3_PREFIX;
@@ -39,7 +39,7 @@
             git clone -b main --depth=1 https://github.com/swoole/phpy.git
 EOF
         )
-        //->withPeclVersion('1.0.8')
+        //->withPeclVersion('1.0.11')
         ->withDependentExtensions(...$dependentExtensions)
         ->withDependentLibraries(...$dependentLibraries);
     $p->addExtension($ext);
diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php
@@ -5,13 +5,15 @@
 
 return function (Preprocessor $p) {
 
+
     $options = [];
 
     $dependentLibraries = ['curl', 'openssl', 'cares', 'zlib', 'brotli', 'nghttp2', 'sqlite3', 'unix_odbc', 'pgsql', 'libzstd'];
     $dependentExtensions = ['curl', 'openssl', 'sockets', 'mysqlnd', 'pdo'];
 
     // v5.1.x 不支持 PHP 8.4
     // swoole 支持计划 https://wiki.swoole.com/zh-cn/#/version/supported?id=%e6%94%af%e6%8c%81%e8%ae%a1%e5%88%92
+
     $swoole_tag = 'v6.0.1';
     $file = "swoole-{$swoole_tag}.tar.gz";
 
diff --git a/sapi/src/builder/library/gettext.php b/sapi/src/builder/library/gettext.php
diff --git a/sapi/src/builder/library/mpdecimal.php b/sapi/src/builder/library/mpdecimal.php
diff --git a/sapi/src/builder/library/python3.php b/sapi/src/builder/library/python3.php
diff --git a/sapi/src/builder/library/unix_odbc.php b/sapi/src/builder/library/unix_odbc.php
diff --git a/sapi/src/constants.php b/sapi/src/constants.php
