merge code

jingjingxyk · jingjingxyk · commit 0e69aa02de70 · 2024-12-30T15:27:56.000+08:00
diff --git a/.github/workflows/artifact-hash.yml b/.github/workflows/artifact-hash.yml
@@ -38,8 +38,10 @@ jobs:
       - name: upload artifacts to cloud object storage
         if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (inputs.enable_upload_cloud_object_storage == true) }}
         env:
-          SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
-          SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          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 }}
 
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -206,7 +206,9 @@ jobs:
       - name: upload artifacts to cloud object storage
         if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/'))  }}
         env:
-          SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
-          SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          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-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-linux-arm64.tar.xz
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -241,8 +241,10 @@ jobs:
       - name: upload artifacts to cloud object storage
         if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/'))  }}
         env:
-          SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
-          SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          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-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-linux-x64.tar.xz
 
diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -173,7 +173,9 @@ jobs:
       - name: upload artifacts to cloud object storage
         if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/'))  }}
         env:
-          SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
-          SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          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-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-macos-arm64.tar.xz
diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -184,7 +184,9 @@ jobs:
       - name: upload artifacts to cloud object storage
         if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/'))  }}
         env:
-          SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
-          SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          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-file ${{ github.workspace }}/swoole-cli-v${{ env.APP_VERSION }}-macos-x64.tar.xz
diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml
@@ -95,7 +95,7 @@ jobs:
         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
@@ -180,8 +180,10 @@ jobs:
       - name: upload artifacts to cloud object storage
         if: ${{ 0 && (github.repository == 'swoole/swoole-cli') && (startsWith(github.ref, 'refs/tags/'))  }}
         env:
-          SECRET_ID: ${{ secrets.QCLOUD_OSS_SECRET_ID }}
-          SECRET_KEY: ${{ secrets.QCLOUD_OSS_SECRET_KEY }}
+          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"
diff --git a/sapi/quickstart/linux/arm64/README.md b/sapi/quickstart/linux/arm64/README.md
@@ -1,18 +1,20 @@
 # x86_64 运行 arm64
+
 > 使用 qemu-user-static 实现
 
 ## 参考文档
+
 qemu
-    https://www.qemu.org/
-    https://github.com/qemu/qemu.git
+https://www.qemu.org/
+https://github.com/qemu/qemu.git
 
 qemu-user-static
-    https://github.com/multiarch/qemu-user-static.git
+https://github.com/multiarch/qemu-user-static.git
 
 x86 平台利用 qemu-user-static 实现 arm64 平台 docker 镜像的运行和构建
-    https://www.cnblogs.com/chen2ha/p/17180287.html
+https://www.cnblogs.com/chen2ha/p/17180287.html
 
 Docker在x86架构的物理机上跑Qemu-arm 容器
-    https://blog.csdn.net/sunSHINEEzy/article/details/80015638
+https://blog.csdn.net/sunSHINEEzy/article/details/80015638
 
 
diff --git a/sapi/quickstart/linux/connection-swoole-cli-alpine.sh b/sapi/quickstart/linux/connection-swoole-cli-alpine.sh
@@ -8,4 +8,4 @@ __DIR__=$(
 
 cd ${__DIR__}
 
-docker exec -it swoole-cli-alpine-dev sh
+docker exec -it woole-cli-builder sh
diff --git a/sapi/quickstart/linux/extra/README.md b/sapi/quickstart/linux/extra/README.md
@@ -1,6 +1,4 @@
-#
-
-## 当环境中没有 PHP 解释器时  可以快速安装 PHP 解释器
+# 当环境中没有 PHP 解释器时  可以快速安装 PHP 解释器
 
 ```bash
 
diff --git a/sapi/quickstart/linux/install-docker-compose.sh b/sapi/quickstart/linux/install-docker-compose.sh
@@ -24,7 +24,7 @@ if [ ! -f /usr/libexec/docker/cli-plugins/docker-compose ]; then
 
   # show more version info
   # https://github.com/docker/compose/releases
-  VERSION="v2.29.1"
+  VERSION="v2.32.1"
 
   curl -fsSL "https://github.com/docker/compose/releases/download/${VERSION}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 
diff --git a/sapi/quickstart/linux/install-docker.sh b/sapi/quickstart/linux/install-docker.sh
@@ -28,7 +28,6 @@ while [ $# -gt 0 ]; do
   shift $(($# > 0 ? 1 : 0))
 done
 
-
 # https://github.com/docker/docker-install.git
 # test -f get-docker.sh || curl -fsSL https://get.docker.com -o get-docker.sh
 
@@ -41,14 +40,15 @@ china | ustc | tuna)
   ;;
 esac
 
-
 if [ -n "$http_proxy" ] || [ -n "$https_proxy" ] || [ -n "$HTTP_PROXY" ] || [ -n "$HTTPS_PROXY" ]; then
-    echo 'Please delete proxy settings !'
-    echo 'Execute this script again ！'
-    exit 0
+  set +u
+  uset http_proxy
+  uset https_proxy
+  uset HTTP_PROXY
+  uset HTTPS_PROXY
+  set -u
 fi
 
-
 case "$MIRROR" in
 china | ustc)
   sed -i "s@https://mirrors.aliyun.com/docker-ce@https://mirrors.ustc.edu.cn/docker-ce@g" get-docker.sh
diff --git a/sapi/quickstart/linux/run-alpine-container-full.sh b/sapi/quickstart/linux/run-alpine-container-full.sh
@@ -12,7 +12,6 @@ __PROJECT__=$(
 cd ${__DIR__}
 
 {
-  docker stop swoole-cli-alpine-dev
   docker stop swoole-cli-builder
   sleep 5
 } || {
diff --git a/sapi/quickstart/linux/run-alpine-container.sh b/sapi/quickstart/linux/run-alpine-container.sh
@@ -12,7 +12,6 @@ __PROJECT__=$(
 cd ${__DIR__}
 
 {
-  docker stop swoole-cli-alpine-dev
   docker stop swoole-cli-builder
   sleep 5
 } || {
@@ -28,9 +27,9 @@ while [ $# -gt 0 ]; do
   --mirror)
     MIRROR="$2"
     case "$MIRROR" in
-      china | openatom)
-        IMAGE="hub.atomgit.com/library/alpine:3.18"
-        ;;
+    china | openatom)
+      IMAGE="hub.atomgit.com/library/alpine:3.18"
+      ;;
     esac
     ;;
   esac
diff --git a/sapi/quickstart/linux/run-debian-container.sh b/sapi/quickstart/linux/run-debian-container.sh
@@ -27,15 +27,14 @@ while [ $# -gt 0 ]; do
   --mirror)
     MIRROR="$2"
     case "$MIRROR" in
-      china | openatom)
-        IMAGE="hub.atomgit.com/library/debian:12"
-        ;;
+    china | openatom)
+      IMAGE="hub.atomgit.com/library/debian:12"
+      ;;
     esac
     ;;
   esac
   shift $(($# > 0 ? 1 : 0))
 done
 
-
 cd ${__DIR__}
 docker run --rm --name swoole-cli-debian-dev -d -v ${__PROJECT__}:/work -w /work --init $IMAGE tail -f /dev/null
diff --git a/sapi/quickstart/windows/cygwin-build/README.md b/sapi/quickstart/windows/cygwin-build/README.md
@@ -14,21 +14,5 @@ sapi\quickstart\windows\cygwin-build\install-cygwin.bat
 
 ```
 
-# windows 软连接例子
-
-```bash
-
-mklink composer composer.phar
-
-```
-
-## 其他
-
-1. [windows build native php](./windows-native.md)
-1. [install msys2 ](./install-msys2.md)
-
-
-
-
 
 
diff --git a/sapi/quickstart/windows/windows.md b/sapi/quickstart/windows/windows.md
@@ -17,3 +17,11 @@ git config core.ignorecase false # 设置 Git 在 Windows 上也区分大小写
 [7zip](https://7-zip.org/)
 [visualstudio](https://visualstudio.microsoft.com/zh-hans/downloads/)
 [windows-sdk](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
+
+## windows 软连接例子
+
+```bash
+
+mklink composer composer.phar
+
+```
diff --git a/sapi/scripts/cygwin/cygwin-build.sh b/sapi/scripts/cygwin/cygwin-build.sh
@@ -21,8 +21,8 @@ if [ -n "${GITHUB_ACTION}" ]; then
   if test $LOGICAL_PROCESSORS -ge 4; then
     LOGICAL_PROCESSORS=$((LOGICAL_PROCESSORS - 2))
   fi
-  make  cli
-  # make -j $LOGICAL_PROCESSORS cli
+  make cli
+  # make -j $LOGICAL_PROCESSORS
 else
   make -j $LOGICAL_PROCESSORS cli
 fi
diff --git a/sapi/scripts/tencent-cloud-object-storage.sh b/sapi/scripts/tencent-cloud-object-storage.sh
@@ -85,7 +85,7 @@ while [ $# -gt 0 ]; do
     export NO_PROXY="${NO_PROXY},.myqcloud.com,.swoole.com"
     PROXY_OPTION="--proxy $2"
     ;;
-  --show-uploaded-file-list)
+  --show)
     UPLOAD_TYPE="show"
     ;;
   esac
@@ -99,9 +99,11 @@ CLOUD_OBJECT_STORAGE_CONFIG=${__PROJECT__}/var/tencent-cloud-object-storage/.ten
 if [ ! -f ${CLOUD_OBJECT_STORAGE_CONFIG} ]; then
   cp -f ${__PROJECT__}/sapi/scripts/tencent-cloud-object-storage.yaml ${CLOUD_OBJECT_STORAGE_CONFIG}
   set +u
-  if [ -n "${SECRET_ID}" ] && [ -n "${SECRET_KEY}" ]; then
-    sed -i.bak "s/\${{ secrets.QCLOUD_OSS_SECRET_ID }}/${SECRET_ID}/" ${CLOUD_OBJECT_STORAGE_CONFIG}
-    sed -i.bak "s/\${{ secrets.QCLOUD_OSS_SECRET_KEY }}/${SECRET_KEY}/" ${CLOUD_OBJECT_STORAGE_CONFIG}
+  if [ -n "${OSS_SECRET_ID}" ] && [ -n "${OSS_SECRET_KEY}" ]; then
+    sed -i.bak "s/\${{ secrets.QCLOUD_OSS_SECRET_ID }}/${OSS_SECRET_ID}/" ${CLOUD_OBJECT_STORAGE_CONFIG}
+    sed -i.bak "s/\${{ secrets.QCLOUD_OSS_SECRET_KEY }}/${OSS_SECRET_KEY}/" ${CLOUD_OBJECT_STORAGE_CONFIG}
+    sed -i.bak "s/\${{ vars.QCLOUD_OSS_BUCKET }}/${OSS_BUCKET}/" ${CLOUD_OBJECT_STORAGE_CONFIG}
+    sed -i.bak "s/\${{ vars.QCLOUD_OSS_REGION }}/${OSS_REGION}/" ${CLOUD_OBJECT_STORAGE_CONFIG}
   fi
   set -u
 fi
@@ -113,8 +115,9 @@ fi
 test -f ${APP_RUNTIME} || curl -fSLo ${APP_RUNTIME} https://github.com/tencentyun/coscli/releases/download/${APP_VERSION}/${APP_RUNTIME}
 chmod a+x ${APP_RUNTIME}
 
+BUCKET_NAME=$(grep "\- name: " ${CLOUD_OBJECT_STORAGE_CONFIG} | sed 's/\- name: //g' | sed 's/^ *//;s/ *$//' | tr -d '"')
 COSCLI="${__PROJECT__}/var/tencent-cloud-object-storage/${APP_RUNTIME} --config-path ${CLOUD_OBJECT_STORAGE_CONFIG} --log-path ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log "
-COS_BUCKET_FOLDER="cos://wenda-1252906962/dist/"
+COS_BUCKET_FOLDER="cos://${BUCKET_NAME}/dist/"
 
 if [ "${UPLOAD_TYPE}" == 'all' ]; then
   if [ ! -d ${__PROJECT__}/var/artifact-hash/${SWOOLE_CLI_VERSION} ]; then
@@ -147,8 +150,8 @@ if [ "${UPLOAD_TYPE}" == 'single' ]; then
 fi
 
 if [ "${UPLOAD_TYPE}" == 'show' ]; then
-  cat ${CLOUD_OBJECT_STORAGE_CONFIG}
-  ${COSCLI} --help
+  # cat ${CLOUD_OBJECT_STORAGE_CONFIG}
+  # ${COSCLI} --help
   ${COSCLI} ls ${COS_BUCKET_FOLDER}
   exit 0
 fi
diff --git a/sapi/scripts/tencent-cloud-object-storage.yaml b/sapi/scripts/tencent-cloud-object-storage.yaml
@@ -8,9 +8,9 @@ cos:
     cvmrolename: ""
     closeautoswitchhost: "true"
   buckets:
-    - name: "wenda-1252906962"
-      alias: "wenda-1252906962"
-      region: "ap-shanghai"
+    - name: "${{ vars.QCLOUD_OSS_BUCKET }}"
+      alias: "${{ vars.QCLOUD_OSS_BUCKET }}"
+      region: "${{ vars.QCLOUD_OSS_REGION }}"
       #      endpoint: cos.ap-shanghai.myqcloud.com
       #      endpoint: wenda-1252906962.cos.accelerate.myqcloud.com
       endpoint: "cos.accelerate.myqcloud.com"

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ __DIR__=$(`
`8`	`8`
`9`	`9`	`cd ${__DIR__}`
`10`	`10`
`11`		`-docker exec -it swoole-cli-alpine-dev sh`
	`11`	`+docker exec -it woole-cli-builder sh`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,4 @@ @@
 -#
+-
 -## 当环境中没有 PHP 解释器时  可以快速安装 PHP 解释器
 +# 当环境中没有 PHP 解释器时  可以快速安装 PHP 解释器
 ```bash