merge code

Author: jingjingxyk

sapi/scripts/tencent-cloud-object-storage.sh

@@ -135,27 +135,31 @@ set -u
 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 swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
-  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
-  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
-  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
-  ${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
-  status=$?
+  {
+    ${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}
+    status=$?
+  } || {
+    status=$?
+  }
   if [[ $status -ne 0 ]]; then
     echo $status
-    cat ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log
+    cat ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log
     exit 1
   fi
   cd ${__PROJECT__}
   exit 0
 fi
 
 if [ "${UPLOAD_TYPE}" == 'single' ]; then
-  ${COSCLI} cp ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
+  ${COSCLI} cp --forbid-overwrite --fail-output-path ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
   status=$?
   if [[ $status -ne 0 ]]; then
     echo $status
-    cat ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log
+    cat ${__PROJECT__}/var/tencent-cloud-object-storage/upload.log
     exit 1
   fi
   exit 0

sapi/src/builder/extension/phpy.php

@@ -13,7 +13,10 @@
 
     $tag = 'v1.0.11';
 
+
     $python3_prefix = PYTHON3_PREFIX;
+    # $python3_prefix = '/opt/anaconda3';
+
     $options = [];
     $options[] = '--enable-phpy';
     $options[] = ' --with-python-version=3.12.2';
@@ -25,6 +28,7 @@
 
     $ext = (new Extension('phpy'))
         ->withOptions(implode(' ', $options))
+        //->withOptions('') //不启用编译选项
         ->withLicense('https://github.com/swoole/phpy/blob/main/LICENSE', Extension::LICENSE_APACHE2)
         ->withHomePage('https://github.com/swoole/phpy/')
         ->withManual('https://github.com/swoole/phpy/')

sapi/src/builder/library/imagemagick.php

@@ -16,7 +16,6 @@
             //->withFileHash('md5', '90eb1a9263b47b7e844eb817fe08932c')
             ->withPrefix($imagemagick_prefix)
             ->withBuildCached(false)
-            ->withInstallCached(false)
             ->withConfigure(
                 <<<EOF
             ./configure --help
@@ -107,7 +106,7 @@
                 'libraw',
                 'libtiff',
                 'libdeflate',
-               // 'libjxl'
+            //'libjxl' //咱不启用
             )
     );
 };

sapi/src/builder/library/libheif.php

@@ -41,7 +41,6 @@
         ->withUrl('https://github.com/strukturag/libheif/releases/download/v1.20.2/libheif-1.20.2.tar.gz')
         ->withPrefix($libheif_prefix)
         ->withBuildCached(false)
-        ->withInstallCached(false)
         ->withBuildScript(
             <<<EOF
          mkdir -p build

sapi/src/builder/library/libjxl.php

@@ -6,9 +6,18 @@
 return function (Preprocessor $p) {
     $libjxl_prefix = LIBJXL_PREFIX;
     $brotli_prefix = BROTLI_PREFIX;
+    $libgif_prefix = GIF_PREFIX;
+    $libjpeg_prefix = JPEG_PREFIX;
+    $libpng_prefix = PNG_PREFIX;
+    $zlib_prefix = ZLIB_PREFIX;
+    $libwebp_prefix = WEBP_PREFIX;
     $cmake_prefix_path = "";
     $cmake_prefix_path .= "{$brotli_prefix};";
-    $cmake_prefix_path .= "{$brotli_prefix};";
+    $cmake_prefix_path .= "{$libgif_prefix};";
+    $cmake_prefix_path .= "{$libjpeg_prefix};";
+    $cmake_prefix_path .= "{$libpng_prefix};";
+    $cmake_prefix_path .= "{$zlib_prefix};";
+    $cmake_prefix_path .= "{$libwebp_prefix};";
     $lib = new Library('libjxl');
     $lib->withHomePage('https://github.com/ebiggers/libdeflate')
         ->withLicense('https://github.com/libjxl/libjxl/#BSD-3-Clause-1-ov-file', Library::LICENSE_BSD)
@@ -33,7 +42,8 @@
         -DJPEGXL_ENABLE_EXAMPLES=OFF \
         -DJPEGXL_ENABLE_JNI=OFF \
         -DJPEGXL_STATIC=OFF \
-        -DBUILD_TESTING=OFF
+        -DBUILD_TESTING=OFF \
+        -DCMAKE_PREFIX_PATH="{$cmake_prefix_path}" \
 
 
         cmake --build . --config Release
@@ -51,6 +61,8 @@
         ->withPkgName('aom')
         ->withDependentLibraries(
             'brotli',
+            'libgif',
+            'libjpeg'
         ) ;
 
     $p->addLibrary($lib);