merge code

jingjingxyk · Dec 23, 2024 · d31e56e · d31e56e
2 parents aaa1b95 + 3e636d7
commit d31e56e
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 37 deletions.
diff --git a/.github/workflows/artifact-hash.yml b/.github/workflows/artifact-hash.yml
@@ -11,7 +11,7 @@ on:
       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
@@ -21,6 +21,7 @@ on:
 jobs:
   generate-artifact-hash:
     runs-on: ubuntu-latest
+    if: 0
     steps:
       - uses: actions/checkout@v4
       - name: Show Release File Hash

diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -15,7 +15,7 @@ jobs:
           - "8.2.27"
           - "8.1.31"
           - "8.3.15"
-          - "8.4.2"
+          # - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -17,7 +17,7 @@ jobs:
           - "8.2.27"
           - "8.1.31"
           - "8.3.15"
-          - "8.4.2"
+          # - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -20,8 +20,7 @@ jobs:
           - "8.2.27"
           - "8.1.31"
           - "8.3.15"
-          - "8.4.2"
-
+          # - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -22,7 +22,7 @@ jobs:
           - "8.2.27"
           - "8.1.31"
           - "8.3.15"
-          - "8.4.2"
+          # - "8.4.2"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info

diff --git a/sapi/quickstart/windows/download-cygwin.bat b/sapi/quickstart/windows/download-cygwin.bat
@@ -18,6 +18,6 @@ cd /d %__PROJECT__%\var\windows-cygwin-build-deps\
 
 curl.exe -fSLo setup-x86_64.exe https://cygwin.com/setup-x86_64.exe
 
-copy .\setup-x86_64.exe %__PROJECT__%\ /Y /Q
+copy .\setup-x86_64.exe %__PROJECT__%\
 
 endlocal
diff --git a/sapi/scripts/cygwin/cygwin-config-ext.sh b/sapi/scripts/cygwin/cygwin-config-ext.sh
@@ -22,9 +22,6 @@ while [ $# -gt 0 ]; do
   --php-version)
     PHP_VERSION="$2"
     X_PHP_VERSION=$(echo ${PHP_VERSION:0:3})
-    if [ "$X_PHP_VERSION" = "8.4" ]; then
-      SWOOLE_VERSION='v6.0.0'
-    fi
     ;;
   --swoole-version)
     SWOOLE_VERSION="$2"

diff --git a/sapi/scripts/cygwin/upload-oss.sh b/sapi/scripts/cygwin/upload-oss.sh
diff --git a/sapi/scripts/generate-artifact-hash.sh b/sapi/scripts/generate-artifact-hash.sh
@@ -156,10 +156,10 @@ RUN_DOWNLOAD() {
 
 DOWNLOAD() {
   declare -A PHP_VERSIONS
-  PHP_VERSIONS[0]="v8.2.25"
-  PHP_VERSIONS[1]="v8.1.30"
-  PHP_VERSIONS[2]="v8.3.13"
-  PHP_VERSIONS[3]="v8.4.1"
+  PHP_VERSIONS[0]="v8.2.27"
+  PHP_VERSIONS[1]="v8.1.31"
+  PHP_VERSIONS[2]="v8.3.15"
+  PHP_VERSIONS[3]="v8.4.2"
   for i in "${!PHP_VERSIONS[@]}"; do
     # echo ${PHP_VERSIONS[$i]}
     RUN_DOWNLOAD "${PHP_VERSIONS[$i]}"