Add swoole, disable zts and remove parallel extension

.github/workflows/release.yml

@@ -177,34 +177,36 @@ jobs:
           cp -p "$RPMBUILD_DIR/RPMS/x86_64"/*.rpm $GITHUB_WORKSPACE
       - name: Rename packages to proper name
         run: |
-          ls -lah ./*.rpm
           version=${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}
           rpm_path="./${{ env.APP_NAME }}-${version}-1.x86_64.rpm"
           cp $rpm_path "./${{ env.APP_NAME }}-${version}-1.el7.x86_64.rpm"
           cp $rpm_path "./${{ env.APP_NAME }}-${version}-1.el8.x86_64.rpm"
           mv $rpm_path "./${{ env.APP_NAME }}-${version}-1.el9.x86_64.rpm"
-
-          ls -lah ./*.deb
+          mkdir -p ./artifacts
+          mv *.deb ./artifacts/
+          mv *.rpm ./artifacts/
+          ls -lah ./artifacts/*.deb
+          ls -lah ./artifacts/*.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
           name: artifact-deb-amd64
-          path: ./*.deb
+          path: ./artifacts/*.deb
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
           name: artifact-rpm-el7-amd64
-          path: ./*.el7.*.rpm
+          path: ./artifacts/*.el7.*.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
           name: artifact-rpm-el8-amd64
-          path: ./*.el8.*.rpm
+          path: ./artifacts/*.el8.*.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
           name: artifact-rpm-el9-amd64
-          path: ./*.el9.*.rpm
+          path: ./artifacts/*.el9.*.rpm
   build-linux-packages-arm64:
     needs:
       - build-artifact
@@ -250,12 +252,14 @@ jobs:
 
       - name: Rename package to proper name
         run: |
-          ls -lah ./*.deb
+          mkdir -p ./artifacts
+          mv *.deb ./artifacts
+          ls -lah ./artifacts/*.deb
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
           name: artifact-deb-arm64
-          path: ./*.deb
+          path: ./artifacts/*.deb
       - uses: manticoresoftware/actions-run-on-arch-action@master
         name: Preparing EL7 RPM package
         with:
@@ -308,17 +312,17 @@ jobs:
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
-          name: artifact-rpm-el7-arm64
+          name: artifact-rpm-el7-aarch64
           path: ./artifacts/*.el7.*.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
-          name: artifact-rpm-el8-arm64
+          name: artifact-rpm-el8-aarch64
           path: ./artifacts/*.el8.*.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
-          name: artifact-rpm-el9-arm64
+          name: artifact-rpm-el9-aarch64
           path: ./artifacts/*.el9.*.rpm
 
   build-extra-packages:
@@ -384,35 +388,37 @@ jobs:
 
       - name: Rename packages to proper name
         run: |
-          ls -lah ./*.rpm
-
           version=${{ steps.vars.outputs.app_version }}${{ steps.vars.outputs.rpm_suffix }}
           rpm_path="./${{ env.EXTRA_NAME }}-${version}-1.noarch.rpm"
           cp $rpm_path "./${{ env.EXTRA_NAME }}-${version}-1.el7.noarch.rpm"
           cp $rpm_path "./${{ env.EXTRA_NAME }}-${version}-1.el8.noarch.rpm"
           mv $rpm_path "./${{ env.EXTRA_NAME }}-${version}-1.el9.noarch.rpm"
 
-          ls -lah ./*.deb
+          mkdir -p ./artifacts
+          mv *.deb ./artifacts/
+          mv *.rpm ./artifacts/
+          ls -lah ./artifacts/*.deb
+          ls -lah ./artifacts/*.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
           name: artifact-extra-deb
-          path: ./*.deb
+          path: ./artifacts/*.deb
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
-          name: artifact-extra-el7--rpm
-          path: ./*.el7.noarch.rpm
+          name: artifact-extra-rpm-el7
+          path: ./artifacts/*.el7.noarch.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
-          name: artifact-extra-el8--rpm
-          path: ./*.el8.noarch.rpm
+          name: artifact-extra-rpm-el8
+          path: ./artifacts/*.el8.noarch.rpm
 
       - uses: manticoresoftware/upload_artifact_with_retries@main
         with:
-          name: artifact-extra-el9--rpm
-          path: ./*.el9.noarch.rpm
+          name: artifact-extra-rpm-el9
+          path: ./artifacts/*.el9.noarch.rpm
 
   create-release:
     runs-on: ubuntu-22.04
@@ -504,22 +510,35 @@ jobs:
       matrix:
         include:
           - pkg: deb
-            arch: amd64
+            suffix: "amd64"
             asset_content_type: application/vnd.debian.binary-package
           - pkg: deb
-            arch: arm64
+            suffix: "arm64"
             asset_content_type: application/vnd.debian.binary-package
           - pkg: rpm
-            arch: amd64
+            suffix: "el7-amd64"
             asset_content_type: application/x-rpm
           - pkg: rpm
-            arch: arm64
+            suffix: "el8-amd64"
+            asset_content_type: application/x-rpm
+          - pkg: rpm
+            suffix: "el9-amd64"
+            asset_content_type: application/x-rpm
+          - pkg: rpm
+            suffix: "el7-aarch64"
+            asset_content_type: application/x-rpm
+          - pkg: rpm
+            suffix: "el8-aarch64"
+            asset_content_type: application/x-rpm
+          - pkg: rpm
+            suffix: "el9-aarch64"
             asset_content_type: application/x-rpm
     steps:
       - uses: manticoresoftware/download_artifact_with_retries@main
         with:
-          name: artifact-${{ matrix.pkg }}-${{ matrix.arch }}
+          name: artifact-${{ matrix.pkg }}-${{ matrix.suffix }}
           path: .
+
       - uses: manticoresoftware/download_artifact_with_retries@main
         with:
           name: create-release
@@ -528,7 +547,7 @@ jobs:
       - id: vars
         run: |
           echo "upload_url=$(cat upload_url.txt)" >> $GITHUB_OUTPUT
-          echo "asset_name=$(ls *.${{ matrix.pkg }} | head -n 1)" >> $GITHUB_OUTPUT
+          echo "asset_name=$(ls ./artifacts/*.${{ matrix.pkg }} | head -n 1)" >> $GITHUB_OUTPUT
 
       - name: Upload Release Asset
         id: upload-release-asset
@@ -548,14 +567,22 @@ jobs:
       matrix:
         include:
           - pkg: deb
+            suffix: ""
             asset_content_type: application/vnd.debian.binary-package
           - pkg: rpm
+            suffix: "-el7"
+            asset_content_type: application/x-rpm
+          - pkg: rpm
+            suffix: "-el8"
+            asset_content_type: application/x-rpm
+          - pkg: rpm
+            suffix: "-el9"
             asset_content_type: application/x-rpm
     steps:
       # We download amd64 only but just because of noarch
       - uses: manticoresoftware/download_artifact_with_retries@main
         with:
-          name: artifact-extra-${{ matrix.pkg }}
+          name: artifact-extra-${{ matrix.pkg }}${{ matrix.suffix }}
           path: .
 
       - uses: manticoresoftware/download_artifact_with_retries@main
@@ -565,7 +592,7 @@ jobs:
 
       - name: Prepare package names
         run: |
-          file=$(ls *.${{ matrix.pkg }} | head -n 1)
+          file=$(ls ./artifacts/*.${{ matrix.pkg }} | head -n 1)
           mv "$file" artifact
           rm -f *.${{ matrix.pkg }}
           file=${file/amd64/all}
@@ -575,7 +602,7 @@ jobs:
       - id: vars
         run: |
           echo "upload_url=$(cat upload_url.txt)" >> $GITHUB_OUTPUT
-          echo "asset_name=$(ls *.${{ matrix.pkg }} | head -n 1)" >> $GITHUB_OUTPUT
+          echo "asset_name=$(ls ./artifacts/*.${{ matrix.pkg }} | head -n 1)" >> $GITHUB_OUTPUT
 
       - name: Upload Release Asset
         id: upload-release-asset
@@ -657,32 +684,32 @@ jobs:
             arch: arm64
             delimiter: "-"
             distro: bookworm
-          - artifact: artifact-el7-rpm-amd64
+          - artifact: artifact-rpm-el7-amd64
             type: rpm
             arch: x86_64
             delimiter: "_"
             distro: 7
-          - artifact: artifact-el7-rpm-arm64
+          - artifact: artifact-rpm-el7-aarch64
             type: rpm
             arch: aarch
             delimiter: "_"
             distro: 7
-          - artifact: artifact-el8-rpm-amd64
+          - artifact: artifact-rpm-el8-amd64
             type: rpm
             arch: x86_64
             delimiter: "_"
             distro: 8
-          - artifact: artifact-el8-rpm-arm64
+          - artifact: artifact-rpm-el8-aarch64
             type: rpm
             arch: aarch
             delimiter: "_"
             distro: 8
-          - artifact: artifact-el9-rpm-amd64
+          - artifact: artifact-rpm-el9-amd64
             type: rpm
             arch: x86_64
             delimiter: "_"
             distro: 9
-          - artifact: artifact-el9-rpm-arm64
+          - artifact: artifact-rpm-el9-aarch64
             type: rpm
             arch: aarch
             delimiter: "_"
@@ -691,7 +718,7 @@ jobs:
             type: arc
             arch: noarch
             delimiter: "-"
-            distro: ""  
+            distro: ""
           # manticore-extra meta package now
           - artifact: artifact-extra-deb
             type: deb
@@ -723,17 +750,17 @@ jobs:
             arch: all
             delimiter: "-"
             distro: bookworm
-          - artifact: artifact-extra-el7-rpm
+          - artifact: artifact-extra-rpm-el7
             type: rpm
             arch: noarch
             delimiter: "_"
             distro: 7
-          - artifact: artifact-extra-el8-rpm
+          - artifact: artifact-extra-rpm-el8
             type: rpm
             arch: noarch
             delimiter: "_"
             distro: 8
-          - artifact: artifact-extra-el9-rpm
+          - artifact: artifact-extra-rpm-el9
             type: rpm
             arch: noarch
             delimiter: "_"

build-alpine

@@ -52,7 +52,8 @@ ENABLE_STATIC=yes
   --with-pcre-jit --enable-zstd --with-libzstd  \
   --enable-pcntl --enable-posix \
   --enable-sockets \
-  --enable-zts --enable-parallel --enable-ds \
+  --enable-ds \
+  --enable-swoole \
   --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \

build-bash-base.sh

@@ -9,8 +9,8 @@ set -e
 
 PHP_VERSION="$1"
 ZSTD_REV="2dfcd6524ccdcef6dfdaa97d7f3716b866885093"
-PARALLEL_REV="25ba1ee594c350b0e3e239c6b995d772d0e4fc9c"
 DS_REV="d42750d69beb684ec3ef7b3da48fba769ce57ffc"
+SWOOLE_REV="b72d22ad65dbcc0a5cf75b4d6a483b73c9f32157"
 SKIP_SYSTEM_DEPS="$2"
 BUILD_DEV="$3"
 BUILD_STATIC=1 # Always build static but dev
@@ -43,16 +43,16 @@ cd zstd && git checkout "$ZSTD_REV"
 # cd zstd && make && cd ..
 cd ..
 
-# parallel
-git clone https://github.com/manticoresoftware/krakjoe-parallel.git parallel
-cd parallel && git checkout "$PARALLEL_REV"
-cd ..
-
 # ds
 git clone https://github.com/php-ds/ext-ds.git ds
 cd ds && git checkout "$DS_REV"
 cd ..
 
+# openswoole
+git clone https://github.com/swoole/swoole-src.git swoole
+cd swoole && git checkout "$SWOOLE_REV"
+cd ..
+
 cd ..
 
 BUILD_EXTRA=()

build-linux

@@ -42,7 +42,8 @@ ENABLE_STATIC=yes
   --with-pcre-jit --enable-zstd --with-libzstd  \
   --enable-pcntl --enable-posix \
   --enable-sockets \
-  --enable-zts --enable-parallel --enable-ds \
+  --enable-ds \
+  --enable-swoole \
   --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \

build-osx

@@ -9,7 +9,7 @@
 set -e
 install_deps() {
   brew upgrade
-  brew install curl autoconf automake bison re2c zstd git openssl zlib cmake libzip
+  brew install bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip
 
   OPENSSL_PREFIX="$(brew --prefix openssl)"
   OPENSSL_CFLAGS="-I${OPENSSL_PREFIX}/include"
@@ -82,7 +82,7 @@ fi
   --with-pcre-jit --enable-zstd --with-libzstd  \
   --enable-pcntl --enable-posix \
   --enable-sockets \
-  --enable-zts --enable-parallel \
+  --enable-swoole \
   --with-openssl --with-zlib --with-zip \
   --enable-filter \
   --with-curl \