Merge pull request #982 from jingjingxyk/build_native_php

jingjingxyk · web-flow · commit 1ce516b22844 · 2025-07-16T07:51:23.000+08:00
Build native php
diff --git a/.github/workflows/auto-cache-pool-tarball.yml b/.github/workflows/auto-cache-pool-tarball.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/cache@v4
         id: php-runtime-cache
         with:
-          path: ${{ github.workspace }}/bin/runtime
+          path: ${{ github.workspace }}/runtime
           key: ${{ runner.os }}-x86_64-php-runtime
 
       - name: Cache PHP Vendor
@@ -87,10 +87,10 @@ jobs:
           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
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.1.33
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.2.29
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.3.23
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.4.10
 
           cd ${{ github.workspace }}/pool/
           zip -9 -r ${WORK_DIR}/all-deps.zip ext lib php-tar
diff --git a/.github/workflows/build-alpine-builder-container.sh b/.github/workflows/build-alpine-builder-container.sh
@@ -89,6 +89,8 @@ EOF
 
 : <<'EOF'
 
+# https://github.com/tonistiigi/binfmt
+
 # docker.io/tonistiigi/binfmt:latest
      "supported": [
       "linux/amd64",
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.28"
-          - "8.1.32"
-          - "8.3.19"
-          - "8.4.5"
+          - "8.2.29"
+          - "8.1.33"
+          - "8.3.23"
+          - "8.4.10"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/linux-loongarch.yaml b/.github/workflows/linux-loongarch.yaml
@@ -84,11 +84,14 @@ jobs:
 
           ls -A pool/lib/
           ls -A /usr/local/swoole-cli/
-      - name: Set up QEMU
-        uses: docker://loongarch/qemu-user-static:latest # Replace with your image
+
+      - name: Build
+        uses: addnab/docker-run-action@v3
         with:
-          arch: loongarch64
-          qemu-binary: qemu-loongarch64 # Or your QEMU binary
+          image: cr.loongnix.cn/library/debian
+          options: -v ${{ github.workspace }}:/work/
+          run: |
+            --install loong64
 
       - name: Run LoongArch command
         run: |
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -49,10 +49,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.28"
-          - "8.1.32"
-          - "8.3.19"
-          - "8.4.5"
+          - "8.2.29"
+          - "8.1.33"
+          - "8.3.23"
+          - "8.4.10"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -17,10 +17,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.28"
-          - "8.1.32"
-          - "8.3.19"
-          - "8.4.5"
+          - "8.2.29"
+          - "8.1.33"
+          - "8.3.23"
+          - "8.4.10"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -19,10 +19,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.28"
-          - "8.1.32"
-          - "8.3.19"
-          - "8.4.5"
+          - "8.2.29"
+          - "8.1.33"
+          - "8.3.23"
+          - "8.4.10"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml
@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.28"
-          - "8.1.32"
-          - "8.3.19"
-          - "8.4.5"
+          - "8.2.29"
+          - "8.1.33"
+          - "8.3.23"
+          - "8.4.10"
     steps:
       - name: Show Environment Info
         shell: cmd
diff --git a/.github/workflows/windows-msys2.yml b/.github/workflows/windows-msys2.yml
@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.28"
-          - "8.1.32"
-          - "8.3.19"
-          - "8.4.5"
+          - "8.2.29"
+          - "8.1.33"
+          - "8.3.23"
+          - "8.4.10"
     steps:
       - name: Show Environment Info
         shell: cmd
diff --git a/README.md b/README.md
@@ -33,6 +33,9 @@ curl -fSL https://github.com/swoole/build-static-php/blob/main/setup-php-cli-run
 # windows powershell
 irm https://github.com/swoole/build-static-php/blob/main/setup-swoole-cli-runtime.ps1?raw=true | iex
 
+# windows powershell
+irm https://github.com/swoole/swoole-cli/blob/main/setup-swoole-cli-runtime.ps1?raw=true | iex
+
 # 来自 https://www.swoole.com/download
 curl -fSL https://github.com/swoole/swoole-cli/blob/main/setup-swoole-cli-runtime.sh?raw=true | bash -s -- --mirror china
 
diff --git a/prepare.php b/prepare.php
@@ -32,9 +32,9 @@
 
 
 # PHP 默认版本 （此文件配置 /sapi/PHP-VERSION.conf 在 build_native_php分支 和 衍生分支 无效）
-$php_version = '8.2.28';
-$php_version_id = '802028';
-$php_version_tag = 'php-8.2.28';
+$php_version = '8.2.29';
+$php_version_id = '802029';
+$php_version_tag = 'php-8.2.29';
 
 if ($p->getInputOption('with-php-version')) {
     $subject = $p->getInputOption('with-php-version');
diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh
@@ -11,7 +11,7 @@ __PROJECT__=$(
 )
 cd ${__PROJECT__}
 
-PHP_VERSION='8.2.28'
+PHP_VERSION='8.2.29'
 X_PHP_VERSION='8.2'
 SWOOLE_VERSION=$(awk 'NR==1{ print $1 }' "${__PROJECT__}/sapi/SWOOLE-VERSION.conf")
 
@@ -35,6 +35,7 @@ REDIS_VERSION=6.1.0
 MONGODB_VERSION=1.17.2
 YAML_VERSION=2.2.2
 IMAGICK_VERSION=3.7.0
+SWOOLE_VERSION=$(awk 'NR==1{ print $1 }' "${__PROJECT__}/sapi/SWOOLE-VERSION.conf")
 
 mkdir -p pool/ext
 mkdir -p pool/lib
@@ -105,8 +106,6 @@ tar --strip-components=1 -C ${WORK_TEMP_DIR}/php-src -xf php-${PHP_VERSION}.tar.
 cd ${__PROJECT__}
 # copy extension
 # cp -rf ${WORK_TEMP_DIR}/ext/. ${__PROJECT__}/ext/
-# cp -rf ${__PROJECT__}/ext/. ${WORK_TEMP_DIR}/php-src/ext/
-# cp -rf ${__PROJECT__}/ext/. ${WORK_TEMP_DIR}/php-src/ext/
 cp -rf ${WORK_TEMP_DIR}/ext/. ${WORK_TEMP_DIR}/php-src/ext/
 
 # extension hook
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.28';
+$php_version_tag = '8.2.29';
 $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 = 'c1fbad2787ec3e27bf334cb94b2590f47c10f49b5ea1192165a3e91afe838832';
+$php_archive_file_sha256sum = '7e340723b5521e29a7fae0eeac6808c29ef0906d3557cdd5af00c77c3484f760';
 $download_dir = dirname($php_archive_file);
 $download_php_counter = 0;
 
diff --git a/sapi/scripts/msys2/config-ext.sh b/sapi/scripts/msys2/config-ext.sh
@@ -11,7 +11,7 @@ __PROJECT__=$(
 )
 cd ${__PROJECT__}
 
-PHP_VERSION='8.2.27'
+PHP_VERSION='8.2.29'
 X_PHP_VERSION='8.2'
 SWOOLE_VERSION=$(awk 'NR==1{ print $1 }' "${__PROJECT__}/sapi/SWOOLE-VERSION.conf")
 
diff --git a/sapi/src/builder/extension/swoole.php b/sapi/src/builder/extension/swoole.php
@@ -5,23 +5,19 @@
 
 return function (Preprocessor $p) {
 
+    $file = new SplFileObject(realpath(__DIR__ . '/../../../../sapi/SWOOLE-VERSION.conf'));
+    $swoole_tag = trim($file->current());
+    // $swoole_tag = 'v6.0.1';
+    $file = "swoole-{$swoole_tag}.tar.gz";
+    $url = "https://github.com/swoole/swoole-src/archive/refs/tags/{$swoole_tag}.tar.gz";
+    // 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
 
     $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.2';
-
-    $file = new SplFileObject(realpath(__DIR__ . '/../../../../sapi/SWOOLE-VERSION.conf'));
-    $swoole_tag = trim($file->current());
-
-    $file = "swoole-{$swoole_tag}.tar.gz";
-    $url = "https://github.com/swoole/swoole-src/archive/refs/tags/{$swoole_tag}.tar.gz";
-
     if ($p->getBuildType() === 'debug') {
         $options[] = ' --enable-debug ';
         $options[] = ' --enable-debug-log ';
@@ -70,18 +66,6 @@
         ->withDependentLibraries(...$dependentLibraries)
         ->withDependentExtensions(...$dependentExtensions));
 
-    $p->withBeforeConfigureScript('swoole', function (Preprocessor $p) {
-        $cmd = '';
-        if ($p->isMacos()) {
-            $workDir = $p->getPhpSrcDir();
-            $cmd = <<<EOF
-        cd {$workDir}/
-        sed -i '' 's/pthread_barrier_init/pthread_barrier_init_x_fake/' ext/swoole/config.m4
-EOF;
-        }
-        return $cmd;
-
-    });
     if ($p->isMacos()) {
         # 测试 macos 专有特性
         # 定义 _GNU_SOURCE 会隐式启用 _POSIX_C_SOURCE=200112L 和 _XOPEN_SOURCE=600
@@ -105,6 +89,20 @@
 
     $p->withExportVariable('ZSTD_CFLAGS', '$(pkg-config  --cflags --static  libzstd)');
     $p->withExportVariable('ZSTD_LIBS', '$(pkg-config    --libs   --static  libzstd)');
+
+    $p->withBeforeConfigureScript('swoole', function (Preprocessor $p) {
+        $cmd = '';
+        if ($p->isMacos()) {
+            $workDir = $p->getPhpSrcDir();
+            $cmd = <<<EOF
+        cd {$workDir}/
+        sed -i '' 's/pthread_barrier_init/pthread_barrier_init_x_fake/' ext/swoole/config.m4
+EOF;
+        }
+        return $cmd;
+
+    });
+
     /*
         $p->withBeforeConfigureScript('swoole', function () use ($p) {
             $workDir = $p->getWorkDir();
diff --git a/sapi/src/template/make.php b/sapi/src/template/make.php
@@ -662,7 +662,7 @@
 	echo $LIBS
 elif [ "$1" = "sync" ] ;then
     PHP_CLI=$(which php)
-    test -f ${__PROJECT_DIR__}/runtime/php && PHP_CLI="${__PROJECT_DIR__}/runtime/php -d curl.cainfo=${__PROJECT_DIR__}/runtime/cacert.pem -d openssl.cafile=${__PROJECT_DIR__}/runtime/cacert.pem"
+    test -f ${__PROJECT_DIR__}/runtime/php/php && PHP_CLI="${__PROJECT_DIR__}/runtime/php/php -d curl.cainfo=${__PROJECT_DIR__}/runtime/php/cacert.pem -d openssl.cafile=${__PROJECT_DIR__}/runtime/php/cacert.pem"
     $PHP_CLI -v
     $PHP_CLI sync-source-code.php --action run
     exit 0
diff --git a/sapi/tools/build-native-php-example.sh b/sapi/tools/build-native-php-example.sh
@@ -31,8 +31,7 @@ fi
 mkdir -p /tmp/t
 cd /tmp/t
 
-PHP_VERSION=8.1.21
-PHP_VERSION=8.2.7
+PHP_VERSION=8.2.29
 
 test -f php-${PHP_VERSION}.tar.gz || wget -O php-${PHP_VERSION}.tar.gz https://github.com/php/php-src/archive/refs/tags/php-${PHP_VERSION}.tar.gz
 test -d php-src && rm -rf php-src
diff --git a/sapi/tools/build-static-php.sh b/sapi/tools/build-static-php.sh
@@ -7,7 +7,7 @@ __DIR__=$(
 
 set -uex
 
-PHP_VERSION=8.2.21
+PHP_VERSION=8.2.29
 
 test -f php-${PHP_VERSION}.tar.gz || curl -fSLo php-${PHP_VERSION}.tar.gz https://github.com/php/php-src/archive/refs/tags/php-${PHP_VERSION}.tar.gz
 test -d php-src && rm -rf php-src
diff --git a/sapi/tools/genereate-php-extension-example.sh b/sapi/tools/genereate-php-extension-example.sh
@@ -32,9 +32,9 @@ alias php="'php -c ${__PROJECT__}/runtime/php-cli/php.ini'"
 
 php ${__PROJECT__}/sapi/scripts/download-php-src-archive.php
 
-php ${__PROJECT__}/var/php-8.2.23/ext/ext_skel.php --help
+php ${__PROJECT__}/var/php-8.2.29/ext/ext_skel.php --help
 
 # 创建扩展
 # 使用 `--dir ${__PROJECT__}/../ ` # 指定生成扩展的目录
 
-php ${__PROJECT__}/var/php-8.2.23/ext/ext_skel.php --ext example --author jingjingxyk --std
+php ${__PROJECT__}/var/php-8.2.29/ext/ext_skel.php --ext example --author jingjingxyk --std
