merge code

Author: jingjingxyk

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

@@ -9,7 +9,7 @@ on:
 
 jobs:
   auto-cache-pool:
-    if: ${{ (github.repository_owner == 'swoole') }}
+    if: ${{ (github.repository_owner == 'swoole') || (github.repository_owner == 'jingjingxyk') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -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
@@ -73,24 +73,25 @@ jobs:
           mkdir -p pool/ext
           mkdir -p pool/php-tar/
           mkdir -p runtime/
-          if [ ! -f runtime/php ] ; then
+          test -f runtime/php && rm -f runtime/php
+          if [ ! -f runtime/php/php ] ; then
               bash  setup-php-runtime.sh
           fi
 
           WORK_DIR=${{ github.workspace }}
-          export PATH=${WORK_DIR}/runtime/:$PATH
-          alias php="php -d curl.cainfo=${WORK_DIR}/runtime/cacert.pem -d openssl.cafile=${WORK_DIR}/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  --no-dev
           composer dump-autoload --optimize --profile --no-dev
 
           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

.github/workflows/build-alpine-builder-container.sh

@@ -50,7 +50,7 @@ case $ARCH in
   PLATFORM="linux/mips64le"
   ;;
 'loongarch64')
-  PLATFORM="linux/mips64le"
+  PLATFORM="linux/loongarch64"
   ;;
 esac
 
@@ -89,6 +89,8 @@ EOF
 
 : <<'EOF'
 
+# https://github.com/tonistiigi/binfmt
+
 # docker.io/tonistiigi/binfmt:latest
      "supported": [
       "linux/amd64",

.github/workflows/build-debian-builder-container.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -exu
 __DIR__=$(
@@ -18,7 +18,9 @@ cp -f ${__PROJECT__}/sapi/quickstart/linux/debian-init.sh .
 cp -f ${__PROJECT__}/sapi/quickstart/linux/extra/debian-php-init.sh .
 
 cat > Dockerfile <<'EOF'
-FROM debian:unstable-20240110-slim
+ARG BASE_IMAGE=debian:12
+FROM ${BASE_IMAGE}
+# FROM debian:unstable
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
@@ -43,12 +45,15 @@ EOF
 
 
 PLATFORM='linux/amd64'
-
+BASE_IMAGE="debian:12"
 while [ $# -gt 0 ]; do
   case "$1" in
   --platform)
     PLATFORM="$2"
     ;;
+  --container-image)
+    BASE_IMAGE="$2"
+    ;;
   --*)
     echo "Illegal option $1"
     ;;
@@ -59,8 +64,8 @@ done
 
 
 IMAGE='swoole-cli-builder:latest'
-docker buildx build -t ${IMAGE} -f ./Dockerfile .  --platform ${PLATFORM}
-
+docker buildx build -t ${IMAGE} -f ./Dockerfile .  --platform ${PLATFORM} --build-arg BASE_IMAGE="${BASE_IMAGE}"
+docker images
 docker save -o "swoole-cli-builder-image.tar" ${IMAGE}
 
 

.github/workflows/linux-aarch64-qemu.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
@@ -105,7 +105,8 @@ jobs:
           mkdir -p pool/ext
           mkdir -p bin/
           mkdir -p runtime/
-          if [ ! -f runtime/php ] ; then
+          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
@@ -120,8 +121,8 @@ jobs:
           run: |
             set -eux
             uname -m
-            export PATH=/work/runtime:$PATH  # 容器已经内置 php 和 composer
-            alias php="php -d curl.cainfo=/work/runtime/cacert.pem -d openssl.cafile=/work/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"
 
             # sed -i 's/mirrors.tuna.tsinghua.edu.cn/dl-cdn.alpinelinux.org/g' /etc/apk/repositories
             # sed -i 's/mirrors.ustc.edu.cn/dl-cdn.alpinelinux.org/g' /etc/apk/repositories