merge code

Author: jingjingxyk

.github/workflows/runner-images.md

@@ -1,4 +1,5 @@
-
 [runner-images](https://github.com/actions/runner-images/tree/main/images)
 
-[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/windows-cygwin.yml

@@ -27,7 +27,7 @@ jobs:
           systeminfo
           systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
           systeminfo | findstr /B /C:"Manufacturer" /C:"Product" /C:"Version"
-          env
+          set
           ipconfig
           uname -a
           pwd
@@ -75,29 +75,40 @@ jobs:
         #  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
+        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
 
@@ -157,7 +168,7 @@ jobs:
           files: php-cli-v${{ env.APP_VERSION }}-cygwin-x64.zip
 
   upload-to-cloud-object-storage:
-    if: 1
+    if: 0
     runs-on: ubuntu-latest
     needs: windows-cygwin
     steps:

docs/Cygwin.md

@@ -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
 

sapi/quickstart/linux/run-alpine-container-full.sh

@@ -13,6 +13,7 @@ cd ${__DIR__}
 
 {
   docker stop swoole-cli-alpine-dev
+  docker stop swoole-cli-builder
   sleep 5
 } || {
   echo $?
@@ -21,7 +22,7 @@ cd ${__DIR__}
 
 IMAGE=alpine:3.18
 
-:<<'EOF'
+: <<'EOF'
    启动此容器
 
    已经内置了 php 、composer 、 编译好的依赖库
@@ -52,31 +53,29 @@ case $ARCH in
 'x86_64')
   TAG=all-dependencies-alpine-3.18-php8-v1.0.0-x86_64-20240715T132512Z
   IMAGE=docker.io/jingjingxyk/build-swoole-cli:${TAG}
-  if [ "$MIRROR" = 'china' ] ; then
+  if [ "$MIRROR" = 'china' ]; then
     IMAGE=registry.cn-beijing.aliyuncs.com/jingjingxyk-public/app:${TAG}
   fi
   ;;
 'aarch64')
   TAG=all-dependencies-alpine-3.18-php8-v1.0.0-aarch64-20240618T091126Z
   IMAGE=docker.io/jingjingxyk/build-swoole-cli:${TAG}
-    if [ "$MIRROR" = 'china' ] ; then
-      IMAGE=registry.cn-hangzhou.aliyuncs.com/jingjingxyk-public/app:${TAG}
-    fi
+  if [ "$MIRROR" = 'china' ]; then
+    IMAGE=registry.cn-hangzhou.aliyuncs.com/jingjingxyk-public/app:${TAG}
+  fi
   ;;
 *)
   echo "此 ${ARCH} 架构的容器 容器未配置"
   exit 0
   ;;
 esac
 
-
 cd ${__DIR__}
 
-if [ $DEV_SHM -eq 1 ] ; then
+if [ $DEV_SHM -eq 1 ]; then
   mkdir -p /dev/shm/swoole-cli/thirdparty/
   mkdir -p /dev/shm/swoole-cli/ext/
-  docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -v /dev/shm/swoole-cli/thirdparty/:/work/thirdparty/ -v /dev/shm/swoole-cli/ext/:/work/ext/ -w /work --init $IMAGE tail -f /dev/null
+  docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -v /dev/shm/swoole-cli/thirdparty/:/work/thirdparty/ -v /dev/shm/swoole-cli/ext/:/work/ext/ -w /work --init $IMAGE tail -f /dev/null
 else
-  docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
+  docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
 fi
-

sapi/quickstart/linux/run-alpine-container.sh

@@ -13,6 +13,7 @@ cd ${__DIR__}
 
 {
   docker stop swoole-cli-alpine-dev
+  docker stop swoole-cli-builder
   sleep 5
 } || {
   echo $?
@@ -37,4 +38,4 @@ while [ $# -gt 0 ]; do
 done
 
 cd ${__DIR__}
-docker run --rm --name swoole-cli-alpine-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
+docker run --rm --name swoole-cli-builder -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null

sapi/quickstart/windows/README.md …uickstart/windows/cygwin-build/README.mdsapi/quickstart/windows/README.md renamed to sapi/quickstart/windows/cygwin-build/README.md sapi/quickstart/windows/README.md renamed to sapi/quickstart/windows/cygwin-build/README.md

@@ -1,15 +1,15 @@
 # windows 快速准备构建环境
 
-## [windows cygwin 环境 构建步骤](../../../docs/Cygwin.md)
+## [windows cygwin 环境 构建步骤](../../../../docs/Cygwin.md)
 
 ## 双击如下两个脚本，自动下载cygwin 和 cygwin安装依赖库
 
 ```shell
 
 # 自动下载 cygwin
-sapi\quickstart\windows\download-cygwin.bat
-# 自动安装 cygwin
-sapi\quickstart\windows\install-cygwin.bat
+sapi\quickstart\windows\cygwin-build\download-cygwin.bat
+# 自动安装 依赖包
+sapi\quickstart\windows\cygwin-build\install-cygwin.bat
 
 
 ```

…i/quickstart/windows/download-cygwin.bat …windows/cygwin-build/download-cygwin.batsapi/quickstart/windows/download-cygwin.bat renamed to sapi/quickstart/windows/cygwin-build/download-cygwin.bat sapi/quickstart/windows/download-cygwin.bat renamed to sapi/quickstart/windows/cygwin-build/download-cygwin.bat

@@ -7,7 +7,7 @@ setlocal
 
 echo %~dp0
 cd /d %~dp0
-cd /d ..\..\..\
+cd /d ..\..\..\..\
 
 set "__PROJECT__=%cd%"
 echo %cd%

sapi/quickstart/windows/cygwin-build/install-cygwin.bat

@@ -0,0 +1,43 @@
+@echo off
+:: cygwin site: https://cygwin.com/
+:: start https://cygwin.com/setup-x86_64.exe
+
+setlocal enableextensions enabledelayedexpansion
+
+
+echo %~dp0
+cd /d %~dp0
+cd /d ..\..\..\..\
+
+set "__PROJECT__=%cd%"
+echo %cd%
+:: package  separate with commas
+
+set SITE="https://mirrors.kernel.org/sourceware/cygwin/"
+
+:getopt
+if /i "%1" equ "--mirror" (
+	if /i "%2" equ "china" (
+		set SITE="https://mirrors.ustc.edu.cn/cygwin/"
+	)
+)
+shift
+
+if not (%1)==() goto getopt
+
+if "%GITHUB_ACTIONS%"=="" (
+	setup-x86_64.exe --quiet-mode --disable-buggy-antivirus --site %SITE%
+)
+
+
+setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site  %SITE% --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 %SITE% --packages zip unzip
+
+setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site %SITE% --packages libpq5 libpq-devel
+
+setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site %SITE% --packages libzstd-devel
+
+
+
+endlocal

sapi/quickstart/windows/install-cygwin.bat

@@ -14,13 +14,22 @@ cd ${__PROJECT__}/php-src
 
 mkdir -p bin/.libs
 
-make -j $(nproc) cli
+LOGICAL_PROCESSORS=$(nproc)
+
+set +u
+if [ -n "${GITHUB_ACTION}" ]; then
+  if test $LOGICAL_PROCESSORS -gt 2; then
+    LOGICAL_PROCESSORS=$((LOGICAL_PROCESSORS - 1))
+  fi
+fi
+set -u
+
+make -j $LOGICAL_PROCESSORS cli
 
 ${__PROJECT__}/php-src/sapi/cli/php.exe -v
 
 cp -f ${__PROJECT__}/php-src/sapi/cli/php.exe ${__PROJECT__}/bin/
 
-
 ${__PROJECT__}/bin/php.exe -v
 ${__PROJECT__}/bin/php.exe -m
 ${__PROJECT__}/bin/php.exe --ri swoole