merge code

Author: jingjingxyk

.github/workflows/linux-aarch64.yml

@@ -114,6 +114,7 @@ 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

@@ -139,6 +139,7 @@ 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
 

.gitignore

@@ -334,8 +334,6 @@ php.ini
 sapi/webUI/deploy.sh
 sapi/webUI/public/data/
 Makefile.backup
-ldflags.log
-cppflags.log
 libs.log
 ext/apcu/
 ext/ssh2/
@@ -351,3 +349,5 @@ php-fpm-*
 *.deb
 *.rpm
 nfpm-pkg.yaml
+!/var/.gitkeep
+

bin/.gitkeep

@@ -136,30 +136,28 @@ if [ "${UPLOAD_TYPE}" == 'all' ]; then
   SWOOLE_VERSION=$(echo ${SWOOLE_CLI_VERSION} | awk -F '.' '{ printf "%s.%s.%s" ,$1,$2,$3 }')
   cd ${__PROJECT__}/var/artifact-hash/${SWOOLE_CLI_VERSION}
   {
-    ${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
-    ${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
-    ${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
-    ${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
-    ${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
+    ${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
+    ${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
+    ${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
+    ${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
+    ${COSCLI} cp --forbid-overwrite swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
     status=$?
   } || {
     status=$?
   }
   if [[ $status -ne 0 ]]; then
     echo $status
-    cat ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log
     exit 1
   fi
   cd ${__PROJECT__}
   exit 0
 fi
 
 if [ "${UPLOAD_TYPE}" == 'single' ]; then
-  ${COSCLI} cp --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
   status=$?
   if [[ $status -ne 0 ]]; then
     echo $status
-    cat ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log
     exit 1
   fi
   exit 0
@@ -172,7 +170,6 @@ if [ "${UPLOAD_TYPE}" == 'show' ]; then
   status=$?
   if [[ $status -ne 0 ]]; then
     echo $status
-    cat ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log
     exit 1
   fi
   exit 0