Merge pull request #698 from jingjingxyk/zts

enable zend thread safe
swoole · Jul 16, 2024 · 13f3567 · 13f3567
2 parents bf6a244 + 4485006
commit 13f3567
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -179,4 +179,4 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: swoole-cli-v${{ env.APP_VERSION }}-linux-arm64.tar.xz
+          files: swoole-cli-v${{ env.APP_VERSION }}-zts-linux-arm64.tar.xz
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -156,4 +156,4 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: swoole-cli-v${{ env.APP_VERSION }}-linux-x64.tar.xz
+          files: swoole-cli-v${{ env.APP_VERSION }}-zts-linux-x64.tar.xz
diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -164,4 +164,4 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: swoole-cli-v${{ env.APP_VERSION }}-macos-arm64.tar.xz
+          files: swoole-cli-v${{ env.APP_VERSION }}-zts-macos-arm64.tar.xz
diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -163,4 +163,4 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: swoole-cli-v${{ env.APP_VERSION }}-macos-x64.tar.xz
+          files: swoole-cli-v${{ env.APP_VERSION }}-zts-macos-x64.tar.xz
diff --git a/sapi/src/template/make.php b/sapi/src/template/make.php
@@ -24,6 +24,7 @@
 OPTIONS="--disable-all \
 --enable-shared=no \
 --enable-static=yes \
+--enable-zts \
 <?php foreach ($this->extensionList as $item) : ?>
     <?=$item->options?> \
 <?php endforeach; ?>
@@ -251,7 +252,7 @@
     cd ${__PROJECT_DIR__}/bin/
     SWOOLE_VERSION=$(./swoole-cli -r "echo SWOOLE_VERSION;")
 
-    SWOOLE_CLI_FILE_DEBUG=swoole-cli-v${SWOOLE_VERSION}-<?=$this->getOsType()?>-<?=$this->getSystemArch()?>-debug.tar.xz
+    SWOOLE_CLI_FILE_DEBUG=swoole-cli-v${SWOOLE_VERSION}-zts-<?=$this->getOsType()?>-<?=$this->getSystemArch()?>-debug.tar.xz
     tar -cJvf ${SWOOLE_CLI_FILE_DEBUG} swoole-cli LICENSE pack-sfx.php
 
 
@@ -261,7 +262,7 @@
     cp -f pack-sfx.php  dist/
 
     cd ${__PROJECT_DIR__}/bin/dist/
-    SWOOLE_CLI_FILE=swoole-cli-v${SWOOLE_VERSION}-<?=$this->getOsType()?>-<?=$this->getSystemArch()?>.tar.xz
+    SWOOLE_CLI_FILE=swoole-cli-v${SWOOLE_VERSION}-zts-<?=$this->getOsType()?>-<?=$this->getSystemArch()?>.tar.xz
     strip swoole-cli
     tar -cJvf ${SWOOLE_CLI_FILE} swoole-cli LICENSE pack-sfx.php