Merge pull request #929 from jingjingxyk/feature_v4.8.x

Feature v4.8.x

Author: jingjingxyk

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -exu
 __DIR__=$(
@@ -16,7 +16,7 @@ cd ${__PROJECT__}/var/build-github-action-container/
 
 cp -f ${__PROJECT__}/sapi/quickstart/linux/alpine-init.sh .
 
-cat > Dockerfile <<'EOF'
+cat >Dockerfile <<'EOF'
 FROM alpine:3.18
 
 ENV TZ=Etc/UTC
@@ -25,7 +25,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 ADD ./alpine-init.sh /alpine-init.sh
 
 RUN sh /alpine-init.sh
-# RUN sh /alpine-init.sh --mirror china
 
 RUN uname -m
 RUN mkdir /work
@@ -35,9 +34,25 @@ ENTRYPOINT ["tini", "--"]
 
 EOF
 
-
-
-PLATFORM='linux/amd64'
+PLATFORM=''
+ARCH=$(uname -m)
+case $ARCH in
+'x86_64')
+  PLATFORM='linux/amd64'
+  ;;
+'aarch64')
+  PLATFORM='linux/arm64'
+  ;;
+'riscv64')
+  PLATFORM="linux/riscv64"
+  ;;
+'mips64le')
+  PLATFORM="linux/mips64le"
+  ;;
+'loongarch64')
+  PLATFORM="linux/mips64le"
+  ;;
+esac
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -51,18 +66,14 @@ while [ $# -gt 0 ]; do
   shift $(($# > 0 ? 1 : 0))
 done
 
-
-
 IMAGE='swoole-cli-builder:latest'
-docker buildx build -t ${IMAGE} -f ./Dockerfile .  --platform ${PLATFORM}
+docker buildx build -t ${IMAGE} -f ./Dockerfile . --platform ${PLATFORM}
 
 docker save -o "swoole-cli-builder-image.tar" ${IMAGE}
 
-
-
 # alpine 可设置的架构选项
 # https://hub.docker.com/_/alpine/tags
-:<<'EOF'
+: <<'EOF'
 linux/386
 linux/amd64
 linux/arm/v6
@@ -72,4 +83,5 @@ linux/ppc64le
 linux/s390x
 EOF
 
-
+# 龙芯架构
+# https://cr.loongnix.cn/search

.github/workflows/linux-aarch64-qemu.yml

@@ -0,0 +1,114 @@
+name: build-swoole-cli-linux-aarch64-qemu
+
+on: [ push, pull_request ]
+
+jobs:
+  linux-aarch64-qemu:
+    if: 0
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Show Environment Info
+        run: |
+          lscpu
+          echo $PATH
+          env
+          docker info
+          id -u
+          id -g
+          who
+          cat /etc/os-release
+          hostnamectl
+          uname -s
+          uname -m
+          uname -r
+          export IPV6=$(ip -6 address show  | grep inet6 | awk '{print $2}' | cut -d'/' -f1 | sed -n '2p')
+          export IPV4=$(ip -4 address show  | grep inet | grep -v 127.0.0 | awk '{print $2}' | cut -d'/' -f1 | sed -n '1p')
+          echo $IPV4
+          echo $IPV6
+          echo "X_IPV6=${IPV6}" >> $GITHUB_ENV
+          echo "X_IPV4=${IPV4}" >> $GITHUB_ENV
+
+      - name: Prepare Build Environment
+        run: |
+          git submodule update --init
+
+          sudo mkdir -p /usr/local/swoole-cli
+          uid=$(id -u) && gid=$(id -g) && sudo chown -R ${uid}:${gid} /usr/local/swoole-cli
+
+          mkdir -p ${{ github.workspace }}/var/build-github-action-container/
+
+      - name: Prepare QEMU
+        run: |
+          set -x
+          sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+
+      - name: Prepare swoole-cli-builder-image
+        run: |
+          if [ -f ${{ github.workspace }}/var/build-github-action-container/swoole-cli-builder-image.tar ] ; then
+              docker load -i  ${{ github.workspace }}/var/build-github-action-container/swoole-cli-builder-image.tar
+          else
+              bash .github/workflows/build-alpine-builder-container.sh --platform "linux/arm64"
+          fi
+
+      - name: prepare pre-built library
+        uses: addnab/docker-run-action@v3
+        with:
+          image: docker.io/jingjingxyk/build-swoole-cli:all-dependencies-alpine-3.18-php8-v1.0.0-aarch64-20240618T091126Z
+          options: -v ${{ github.workspace }}:/work -w /work  -v /usr/local/swoole-cli/:/usr/local/tmp/
+          run: |
+            for i in `ls /usr/local/swoole-cli/`
+            do
+               if [ ! -d /usr/local/tmp/${i} ] ; then
+                    echo $i
+                    cp -rf /usr/local/swoole-cli/${i}/  /usr/local/tmp/${i}
+               fi
+            done
+
+      - name: Build
+        uses: addnab/docker-run-action@v3
+        with:
+          image: swoole-cli-builder:latest
+          options: -v ${{ github.workspace }}:/work -w /work  -v /usr/local/swoole-cli:/usr/local/swoole-cli
+          run: |
+            set -eux
+            uname -m
+            if [ ! -f bin/runtime/php ] ; then
+              bash  setup-php-runtime.sh
+            fi
+
+            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"
+
+            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 config
+            bash make.sh build
+            bash make.sh archive
+
+      - name: Show Build Result
+        uses: addnab/docker-run-action@v3
+        with:
+          image: swoole-cli-builder:latest
+          options: -v ${{ github.workspace }}:/work -w /work
+          run: |
+            ./bin/swoole-cli -v
+            ./bin/swoole-cli -m
+            ./bin/swoole-cli --ri gd
+            ./bin/swoole-cli --ri swoole
+            file ./bin/swoole-cli
+            readelf -h ./bin/swoole-cli
+            APP_VERSION=$(./bin/swoole-cli  -v | awk '{print $2}')
+            echo ${APP_VERSION}
+            echo ${APP_VERSION}  > APP_VERSION
+
+            ./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

.github/workflows/linux-aarch64.yml

@@ -5,12 +5,11 @@ on: [ push, pull_request ]
 jobs:
   linux-aarch64:
     if: 1
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
         run: |
-          lscpu
           echo $PATH
           env
           docker info
@@ -22,6 +21,13 @@ jobs:
           uname -s
           uname -m
           uname -r
+
+          cat /proc/cpuinfo | grep name | cut -f2 -d: | uniq -c
+          cat /proc/cpuinfo| grep "physical id"| sort| uniq| wc -l
+          cat /proc/cpuinfo | grep "cpu cores" | uniq
+          cat /proc/cpuinfo| grep "processor"| wc -l
+          lscpu
+
           export IPV6=$(ip -6 address show  | grep inet6 | awk '{print $2}' | cut -d'/' -f1 | sed -n '2p')
           export IPV4=$(ip -4 address show  | grep inet | grep -v 127.0.0 | awk '{print $2}' | cut -d'/' -f1 | sed -n '1p')
           echo $IPV4
@@ -40,14 +46,14 @@ jobs:
 
       - name: Cache PHP Runtime
         uses: actions/cache@v4
-        id: php-runtime-cache
+        id: php-runtime-cache-aarch64
         with:
           path: ${{ github.workspace }}/bin/runtime
           key: ${{ runner.os }}-aarch64-php-runtime
 
       - name: Cache PHP Vendor
         uses: actions/cache@v4
-        id: php-vendor-cache
+        id: php-vendor-cache-aarch64
         with:
           path: ${{ github.workspace }}/vendor
           key: ${{ runner.os }}-aarch64-php-vendor
@@ -61,35 +67,18 @@ jobs:
 
       - name: Cache all-library
         uses: actions/cache@v4
-        id: all-library-cache
+        id: all-library-cache-aarch64
         with:
           path: /usr/local/swoole-cli
           key: ${{ github.head_ref || github.ref_name }}-${{ runner.os }}-aarch64-all-library
 
       - name: Cache swoole-cli-builder-image
         uses: actions/cache@v4
-        id: swoole-cli-builder-image-aarch64-cache
+        id: swoole-cli-builder-image-cache-aarch64
         with:
           path: ${{ github.workspace }}/var/build-github-action-container/swoole-cli-builder-image.tar
           key: ${{ runner.os }}-aarch64-swoole-cli-builder-image
 
-      - name: Prepare Libraries and Extensions
-        run: |
-          set -x
-          mkdir -p pool/lib
-          mkdir -p pool/ext
-          mkdir -p bin/runtime
-
-          bash sapi/download-box/download-box-get-archive-from-server.sh
-
-          ls -A pool/lib/
-          ls -A /usr/local/swoole-cli/
-
-      - name: Prepare QEMU
-        run: |
-          set -x
-          sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-
       - name: Prepare swoole-cli-builder-image
         run: |
           if [ -f ${{ github.workspace }}/var/build-github-action-container/swoole-cli-builder-image.tar ] ; then
@@ -98,19 +87,18 @@ jobs:
               bash .github/workflows/build-alpine-builder-container.sh --platform "linux/arm64"
           fi
 
-      - name: prepare pre-built library
-        uses: addnab/docker-run-action@v3
-        with:
-          image: docker.io/jingjingxyk/build-swoole-cli:all-dependencies-alpine-3.18-php7-v1.0.0-aarch64-20240106T123157Z
-          options: -v ${{ github.workspace }}:/work -w /work  -v /usr/local/swoole-cli/:/usr/local/tmp/
-          run: |
-            for i in `ls /usr/local/swoole-cli/`
-            do
-               if [ ! -d /usr/local/tmp/${i} ] ; then
-                    echo $i
-                    cp -rf /usr/local/swoole-cli/${i}/  /usr/local/tmp/${i}
-               fi
-            done
+      - name: Prepare Runtime and Libraries and Extensions
+        run: |
+          set -x
+          mkdir -p pool/lib
+          mkdir -p pool/ext
+          mkdir -p bin/runtime
+          if [ ! -f bin/runtime/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: Build
         uses: addnab/docker-run-action@v3
@@ -120,10 +108,6 @@ jobs:
           run: |
             set -eux
             uname -m
-            if [ ! -f bin/runtime/php ] ; then
-              bash  setup-php-runtime.sh
-            fi
-
             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"
 
@@ -139,41 +123,26 @@ jobs:
 
             bash make-install-deps.sh
 
-            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
-        uses: addnab/docker-run-action@v3
-        with:
-          image: swoole-cli-builder:latest
-          options: -v ${{ github.workspace }}:/work -w /work
-          run: |
-            ./bin/swoole-cli -v
-            ./bin/swoole-cli -m
-            ./bin/swoole-cli --ri gd
-            ./bin/swoole-cli --ri swoole
-            ./bin/swoole-cli --ri gd
-            ./bin/swoole-cli --ri pgsql
-
-            file ./bin/swoole-cli
-            readelf -h ./bin/swoole-cli
-            APP_VERSION=$(./bin/swoole-cli  -v | awk '{print $2}')
-            echo ${APP_VERSION}
-            echo ${APP_VERSION}  > APP_VERSION
-
-            ./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
 
-      - name: get app version
         run: |
-          APP_VERSION=$(cat ./APP_VERSION)
-          echo $APP_VERSION
+          ./bin/swoole-cli -v
+          ./bin/swoole-cli -m
+          ./bin/swoole-cli --ri gd
+          ./bin/swoole-cli --ri swoole
+          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
 
       - name: production artifacts debug
         uses: actions/upload-artifact@v4