merge code

Author: jingjingxyk

.github/workflows/artifact-hash.yml

@@ -6,13 +6,17 @@ on:
       version:
         required: true
         description: "发版 版本号 tag"
-        default: 'v1.6.0'
+        default: 'v1.7.1'
         type: string
       php-version:
         required: true
         description: "PHP 版本号 "
-        default: 'v8.1.30,v8.2.25,v8.3.13,v8.4.1'
+        default: 'v8.1.31,v8.2.27,v8.3.15,v8.4.2'
         type: string
+      enable_upload_cloud_object_storage:
+        required: false
+        type: boolean
+        description: "上传到云对象存储 (默认不需要上传）"
 
 jobs:
   generate-artifact-hash:
@@ -30,3 +34,14 @@ jobs:
           retention-days: 90
           path: |
             ${{ inputs.version }}-sha256sum
+
+      - name: upload artifacts to cloud object storage
+        if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (inputs.enable_upload_cloud_object_storage == true) }}
+        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: |
+          bash sapi/scripts/tencent-cloud-object-storage.sh --upload-all --swoole-cli-version  ${{ inputs.version }}
+

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

@@ -61,7 +61,7 @@ jobs:
           key: source-code-tarball-pool
 
       - name: Clean Source Code Tarball Cache On Release
-        if: startsWith(github.ref, 'refs/tags/')
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         run:
           rm -rf ${{ github.workspace }}/pool/*
 
@@ -100,7 +100,6 @@ jobs:
           ls -A pool/ext/
 
       - name: production artifacts
-        if: 1
         uses: actions/upload-artifact@v4
         with:
           name: all-deps
@@ -111,7 +110,7 @@ jobs:
 
       - name: gh release
         uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         with:
           files: |
             all-deps.zip

.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.25
+  BUILD_PHP_VERSION: 8.2.27
 
 jobs:
   linux-aarch64:
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.25"
-          - "8.1.30"
-          - "8.3.13"
-          - "8.4.1"
+          - "8.2.27"
+          - "8.1.31"
+          - "8.3.15"
+          - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

.github/workflows/linux-x86_64.yml

@@ -18,12 +18,12 @@ on:
       php_version:
         required: true
         description: "定制构建选项: 指定 PHP 版本(版本号大于等于8.1)"
-        default: '--with-php-version=8.2.13'
+        default: '--with-php-version=8.2.27'
         type: choice
         options:
-          - '--with-php-version=8.1.27'
-          - '--with-php-version=8.2.13'
-          - '--with-php-version=8.3.1'
+          - '--with-php-version=8.1.31'
+          - '--with-php-version=8.2.27'
+          - '--with-php-version=8.3.15'
       build_type:
         required: true
         description: "定制构建选项: 指定构建类型"
@@ -39,7 +39,7 @@ on:
         type: string
 
 env:
-  BUILD_PHP_VERSION: 8.2.25
+  BUILD_PHP_VERSION: 8.2.27
 
 jobs:
   linux-x86_64:
@@ -48,10 +48,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.25"
-          - "8.1.30"
-          - "8.3.13"
-          - "8.4.1"
+          - "8.2.27"
+          - "8.1.31"
+          - "8.3.15"
+          - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

.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.25
+  BUILD_PHP_VERSION: 8.2.27
 
 jobs:
   macos-aarch64:
@@ -17,10 +17,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.25"
-          - "8.1.30"
-          - "8.3.13"
-          - "8.4.1"
+          - "8.2.27"
+          - "8.1.31"
+          - "8.3.15"
+          - "8.4.2"
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/macos-x86_64.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  BUILD_PHP_VERSION: 8.2.25
+  BUILD_PHP_VERSION: 8.2.27
 
 jobs:
   macos-x86_64:
@@ -19,11 +19,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.25"
-          - "8.1.30"
-          - "8.3.13"
-          - "8.4.1"
-
+          - "8.2.27"
+          - "8.1.31"
+          - "8.3.15"
+          - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
@@ -174,3 +173,4 @@ jobs:
           files: |
             php-fpm-v${{ env.BUILD_PHP_VERSION }}-macos-x64.tar.xz
             php-fpm-v${{ env.BUILD_PHP_VERSION }}-macos-x64-debug.tar.xz
+

.github/workflows/runner-images.md

@@ -0,0 +1,5 @@
+[runner-images](https://github.com/actions/runner-images/tree/main/images)
+
+[available-images](https://github.com/actions/runner-images?tab=readme-ov-file#available-images)
+
+[choosing-github-hosted-runners](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#choosing-github-hosted-runners)

.github/workflows/runner-os-readme.md

@@ -5,31 +5,40 @@ on:
   pull_request:
 
 env:
-  BUILD_PHP_VERSION: 8.2.25
+  BUILD_PHP_VERSION: 8.2.27
 
 jobs:
   windows-cygwin:
-    if: 0
-    runs-on: windows-latest
+    if: 1
+    runs-on: windows-2022
     strategy:
       matrix:
         php-version:
-          - "8.2.25"
-          - "8.1.30"
-          - "8.3.13"
-          - "8.4.1"
-
+          - "8.2.27"
+          - "8.1.31"
+          - "8.3.15"
+          - "8.4.2"
     steps:
-      - name: Prepare git
+      - name: Show Environment Info
+        shell: cmd
         run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-          env
+          ver
+          wmic cpu get name, caption, maxclockspeed, status
+          systeminfo
+          systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
+          systeminfo | findstr /B /C:"Manufacturer" /C:"Product" /C:"Version"
+          set
           ipconfig
           uname -a
           pwd
           ipconfig /all
 
+      - name: Prepare git
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global core.ignorecase false
+
       - uses: actions/checkout@v4
       - name: set php version
         # 参考文档：  https://docs.github.com/zh/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell
@@ -60,35 +69,46 @@ jobs:
 
       - name: Install Cygwin
         uses: cygwin/cygwin-install-action@v2
+        with:
+          site: https://mirrors.kernel.org/sourceware/cygwin/
         # with:
         #  platform: x64
         #  packages: make wget tar libtool re2c bison gcc-g++ autoconf automake openssl libpcre2-devel libssl-devel libcurl-devel libxml2-devel libxslt-devel libgmp-devel ImageMagick libpng-devel libjpeg-devel libfreetype-devel libwebp-devel libsqlite3-devel zlib-devel libbz2-devel liblz4-devel liblzma-devel libzip-devel libicu-devel libonig-devel libcares-devel libsodium-devel libyaml-devel libMagick-devel libzstd-devel libbrotli-devel libreadline-devel  libintl-devel libpq-devel libssh2-devel libidn2-devel gettext-devel coreutils openssl-devel zip unzip
 
-      - name: Install Cygwin Packages
+      - name: Install Cygwin Packages with bash
+        if: 0
         shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}
         run: |
           ls -lah /cygdrive/c/
           ls -lah /cygdrive/d/
-
           cp -f /cygdrive/c/setup.exe  /cygdrive/c/cygwin/bin/setup-x86_64.exe
-
           bash ./sapi/scripts/cygwin/install-cygwin.sh
 
+      - name: Install Cygwin Packages
+        if: 1
+        run: |
+          Copy-Item -Path "C:\setup.exe" -Destination "${{ github.workspace }}\setup-x86_64.exe"
+          cmd /c .\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
+
       - name: Install re2c
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}
         run: |
           bash ./sapi/scripts/cygwin/install-re2c.sh
 
-      - name: Prepare
+      - name: Configure
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}
         run: |
           # git config --global --add safe.directory /cygdrive/d/a/swoole-cli/swoole-cli
           # git submodule update --init
           bash ./sapi/scripts/cygwin/cygwin-config-ext.sh --php-version ${{ env.BUILD_PHP_VERSION }}
 
       - name: Configure
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}
         run: |
           bash ./sapi/scripts/cygwin/cygwin-config.sh --php-version ${{ env.BUILD_PHP_VERSION }}
 
       - name: Build
+        shell: C:\cygwin\bin\bash.EXE --noprofile --norc -e -o pipefail -o igncr   {0}
         run: |
           bash ./sapi/scripts/cygwin/cygwin-build.sh
 
@@ -141,8 +161,30 @@ jobs:
 
       - name: gh release
         uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: php-cli-v${{ env.APP_VERSION }}-cygwin-x64.zip
+
+  upload-to-cloud-object-storage:
+    if: 0
+    runs-on: ubuntu-latest
+    needs: windows-cygwin
+    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*-cygwin-x64)
+          FILE="${{ github.workspace }}/${FILE_NAME}/${FILE_NAME}.zip"
+          bash sapi/scripts/tencent-cloud-object-storage.sh --upload-file ${FILE}

.github/workflows/windows-cygwin.yml

@@ -12,21 +12,43 @@
 
 > 命令行同时安装多个包，包名之间使用逗号隔开
 
+## windows 环境下 配置 git 环境
+
+1. 禁止Git在提交和检出时进行换行符的自动转换‌
+2. 使用`lf` 作为换行符
+3. 区分大小写
+
+```shell
+
+# 下载git
+curl.exe -fSLo Git-2.47.1-64-bit.exe https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.1/Git-2.47.1-64-bit.exe
+
+# 命令行静默安装 git
+start /wait .\Git-2.47.1-64-bit.exe /VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEONEXIT=1 /DIR="C:\Program Files\Git"
+
+
+git config --global core.autocrlf false
+git config --global core.eol lf
+git config --global core.ignorecase false
+
+```
+
 ## 安装cygwin 和 cygwin 依赖项
 
-> 打开 windows 控制台，并找到 setup-x86_64.exe 所在目录, 将 setup-x86_64.exe 复制到 `sapi\quickstart\windows\` 目录
-> 执行如下命令
+> 打开windows CMD 终端，进入项目目录 ，执行如下命令
 
 ```bash
 
 # 自动安装 cygwin 和  cygwin 依赖项
-sapi\quickstart\windows\install-cygwin.bat
+.\sapi\quickstart\windows\cygwin-build\download-cygwin.bat
+.\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
+
 
 ```
 
 构建步骤 - 执行的命令
 ====
-> 运行如下步骤，需要先 打开 cygwin64 Terminal
+> 运行如下步骤，打开 cygwin64 Terminal， 并进入项目目录，执行如下命令
 
 ```shell
 
@@ -122,14 +144,16 @@ libzstd-devel
 
 ## 安装 cygwin 和 安装 cygwin 依赖项  具体执行的命令
 
-> `sapi\quickstart\windows\install-cygwin.bat` 脚本包含的内容
+> 多个包之间 使用逗号分隔
+
+> 编辑修改此文件即可 `.\sapi\quickstart\windows\cygwin-build\install-cygwin.bat`
 
 ```bash
 # 安装 cygwin
-setup-x86_64.exe     --site  https://mirrors.ustc.edu.cn/cygwin/
+setup-x86_64.exe    --site  https://mirrors.ustc.edu.cn/cygwin/
 
 # 安装 cygwin 依赖项
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  https://mirrors.ustc.edu.cn/cygwin/ --packages make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils,openssl-devel
+setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  https://mirrors.ustc.edu.cn/cygwin/ --packages make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils
 
 setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus    --site  https://mirrors.ustc.edu.cn/cygwin/ --packages zip unzip icu libicu-devel