Merge pull request #1059 from jingjingxyk/build_native_php

Build native php

Author: jingjingxyk

.github/workflows/linux-aarch64.yml

@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.29"
-          - "8.1.33"
-          - "8.3.28"
-          - "8.4.15"
+          - "8.2.30"
+          - "8.1.34"
+          - "8.3.29"
+          - "8.4.16"
         #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4
@@ -126,6 +126,8 @@ jobs:
             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
+            git config --global --add safe.directory /work
+
             composer install  --no-interaction --no-autoloader --no-scripts --profile --no-dev
             composer dump-autoload --optimize --profile --no-dev
 

.github/workflows/linux-x86_64.yml

@@ -49,10 +49,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.29"
-          - "8.1.33"
-          - "8.3.28"
-          - "8.4.15"
+          - "8.2.30"
+          - "8.1.34"
+          - "8.3.29"
+          - "8.4.16"
         #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4
@@ -179,6 +179,8 @@ jobs:
             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
+            git config --global --add safe.directory /work
+
             composer install  --no-interaction --no-autoloader --no-scripts --profile --no-dev
             composer dump-autoload --optimize --profile --no-dev
 

.github/workflows/macos-aarch64.yml

@@ -16,10 +16,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.29"
-          - "8.1.33"
-          - "8.3.28"
-          - "8.4.15"
+          - "8.2.30"
+          - "8.1.34"
+          - "8.3.29"
+          - "8.4.16"
         #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4

.github/workflows/macos-x86_64.yml

@@ -19,10 +19,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.29"
-          - "8.1.33"
-          - "8.3.28"
-          - "8.4.15"
+          - "8.2.30"
+          - "8.1.34"
+          - "8.3.29"
+          - "8.4.16"
         #  - "8.5.0"
     steps:
       - uses: actions/checkout@v4

.github/workflows/windows-cygwin.yml

@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.29"
-          - "8.1.33"
-          - "8.3.28"
-          - "8.4.15"
+          - "8.2.30"
+          - "8.1.34"
+          - "8.3.29"
+          - "8.4.16"
         #  - "8.5.0"
     steps:
       - name: Show Environment Info

.github/workflows/windows-msys2.yml

@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.29"
-        #  - "8.1.33"
-          - "8.3.28"
-          - "8.4.15"
+          - "8.2.30"
+        #  - "8.1.34"
+          - "8.3.29"
+          - "8.4.16"
         #  - "8.5.0"
     steps:
       - name: Show Environment Info
@@ -130,3 +130,26 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: ${{ env.APP_NAME }}-${{ env.APP_VERSION }}-msys2-x64.zip
+
+
+  upload-to-cloud-object-storage:
+    if: 1
+    runs-on: ubuntu-latest
+    needs: windows-msys2
+    steps:
+      - name: Prepare Run Environment
+        run:
+          sudo apt install -y curl
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
+      - name: upload artifacts to cloud object storage
+        if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/'))  }}
+        env:
+          OSS_SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
+          OSS_SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          OSS_BUCKET: ${{ vars.QCLOUD_OSS_BUCKET }}
+          OSS_REGION: ${{ vars.QCLOUD_OSS_REGION }}
+        run: |
+          FILE_NAME=$(ls  -d swoole-cli-v*-msys2-x64)
+          FILE="${{ github.workspace }}/${FILE_NAME}/${FILE_NAME}.zip"
+          bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${FILE}

.gitignore

@@ -315,6 +315,7 @@ tmp-php.ini
 /ext/ds
 /ext/xlswriter
 /ext/uuid
+/ext/phpy
 /.phpunit.result.cache
 /samples/sfx/*.phar
 .php-cs-fixer.cache
@@ -335,8 +336,6 @@ php.ini
 sapi/webUI/deploy.sh
 sapi/webUI/public/data/
 Makefile.backup
-ldflags.log
-cppflags.log
 libs.log
 ext/apcu/
 ext/ssh2/
@@ -352,3 +351,4 @@ php-fpm-*
 *.deb
 *.rpm
 nfpm-pkg.yaml
+!/var/.gitkeep

sapi/SWOOLE-VERSION.conf

@@ -1 +1 @@
-v6.1.3
+v6.1.5

sapi/quickstart/windows/msys2-build/install-msys2.sh

@@ -71,6 +71,7 @@ pacman -S --needed --noconfirm icu-devel
 pacman -S --needed --noconfirm gettext-devel
 pacman -S --needed --noconfirm libintl
 pacman -S --needed --noconfirm flex
+pacman -S --needed --noconfirm nasm yasm
 
 : <<'COMMENT'
 # 不存在的包

sapi/scripts/build-swoole-cli-with-linux-gcc.sh

@@ -35,7 +35,7 @@ fi
   --enable-exif \
   --with-sodium \
   --enable-xml --enable-simplexml --enable-xmlreader --enable-xmlwriter --enable-dom --with-libxml \
-  --enable-gd --with-jpeg --with-freetype \
+  --enable-gd --with-jpeg --with-freetype --with-avif \
   --enable-swoole \
   --enable-swoole-curl \
   --enable-cares \
@@ -50,6 +50,7 @@ fi
   --with-imagick \
   --with-yaml \
   --with-readline \
+  --enable-phpy --with-python-config=python3-config \
   --enable-opcache
 
 make -j "$(nproc)"