update

jingjingxyk · Aug 9, 2024 · a41ebc7 · a41ebc7
2 parents 9b189cd + 08fa4b9
commit a41ebc7
Show file tree

Hide file tree

Showing 107 changed files with 1,464 additions and 788 deletions.
diff --git a/.github/workflows/auto-cache-pool-tarball.yml b/.github/workflows/auto-cache-pool-tarball.yml
@@ -60,6 +60,11 @@ jobs:
           path: ${{ github.workspace }}/pool/
           key: source-code-tarball-pool
 
+      - name: Clean Source Code Tarball Cache On Release
+        if: startsWith(github.ref, 'refs/tags/')
+        run:
+          rm -rf ${{ github.workspace }}/pool/*
+
       - name: Prepare Runtime and Libraries and Extensions
         run: |
           set -x
@@ -79,8 +84,8 @@ jobs:
           composer install  --no-interaction --no-autoloader --no-scripts --profile  --no-dev
           composer dump-autoload --optimize --profile --no-dev
 
-          php prepare.php  +inotify +apcu +ds +xlswriter +ssh2 +pgsql +mongodb --with-libavif=1 --show-tarball-hash=1
-          php prepare.php           +apcu +ds +xlswriter +ssh2 +pgsql --with-libavif=1 @macos --show-tarball-hash=1
+          php prepare.php  +inotify +apcu +ds +xlswriter +ssh2  +uuid +mongodb --show-tarball-hash=1
+          php prepare.php           +apcu +ds +xlswriter +ssh2  +uuid @macos --show-tarball-hash=1
 
           cd ${{ github.workspace }}/pool/
           zip -9 -r ${WORK_DIR}/all-deps.zip ext lib

diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -17,7 +17,7 @@ jobs:
         #  - "8.3.3"
     steps:
       - uses: actions/checkout@v4
-      - name: Prepare Source Code
+      - name: Show Environment Info
         run: |
           echo $PATH
           env
@@ -37,9 +37,10 @@ jobs:
           echo "X_IPV6=${IPV6}" >> $GITHUB_ENV
           echo "X_IPV4=${IPV4}" >> $GITHUB_ENV
 
-          echo "BUILD_PHP_VERSION=${{ matrix.php-version }}" >> $GITHUB_ENV
-
+      - name: Prepare Build Environment
+        run: |
           # git submodule update --init
+          echo "BUILD_PHP_VERSION=${{ matrix.php-version }}" >> $GITHUB_ENV
 
           sudo mkdir -p /usr/local/swoole-cli
           uid=$(id -u) && gid=$(id -g) && sudo chown -R ${uid}:${gid} /usr/local/swoole-cli

diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Prepare Source Code
+      - name: Show Environment Info
         run: |
           echo $PATH
           env
@@ -53,6 +53,11 @@ jobs:
           echo ${{ github.head_ref }}
           echo ${{ github.ref_name }}
 
+      - name: Prepare Build Environment
+        run: |
+          # git submodule update --init
+          # echo "BUILD_PHP_VERSION=${{ matrix.php-version }}" >> $GITHUB_ENV
+
           sudo mkdir -p /usr/local/swoole-cli
           uid=$(id -u) && gid=$(id -g) && sudo chown -R ${uid}:${gid} /usr/local/swoole-cli
 
@@ -154,6 +159,14 @@ jobs:
             bash ./make.sh build
             bash ./make.sh archive
 
+      - name: Start Database
+        run: |
+          # 准备数据库容器
+          export PATH=/usr/libexec/docker/cli-plugins/:$PATH
+          docker-compose version
+          docker container ls -a
+          # bash sapi/src/UnitTest/scripts/database/start.sh
+
       - name: Show Build Result
         run: |
           ls ./bin/

diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -61,13 +61,7 @@ jobs:
 
           echo "BUILD_PHP_VERSION=${{ matrix.php-version }}" >> $GITHUB_ENV
 
-          export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
-          export PATH="/opt/homebrew/opt/flex/bin:$PATH"
-          export PATH="/opt/homebrew/opt/bison/bin:$PATH"
           export PATH="/opt/homebrew/opt/libtool/bin:$PATH"
-
-          ln -sf /opt/homebrew/opt/libtool/bin/glibtool /opt/homebrew/opt/libtool/bin/libtool
-          ln -sf /opt/homebrew/opt/libtool/bin/glibtoolize /opt/homebrew/opt/libtool/bin/libtoolize
           ls -lha /opt/homebrew/opt/libtool/bin/
           libtoolize --version
           libtool --help-all
@@ -135,10 +129,6 @@ jobs:
       - name: Build
         run: |
           export PATH=${{ github.workspace }}/bin/runtime:$PATH
-          export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
-          export PATH="/opt/homebrew/opt/flex/bin:$PATH"
-          export PATH="/opt/homebrew/opt/bison/bin:$PATH"
-          export PATH="/opt/homebrew/opt/libtool/bin:$PATH"
 
           bash make-install-deps.sh
 

diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -60,13 +60,7 @@ jobs:
 
           echo "BUILD_PHP_VERSION=${{ matrix.php-version }}" >> $GITHUB_ENV
 
-          export PATH=/usr/local/opt/llvm/bin:$PATH
-          export PATH=/usr/local/opt/flex/bin:$PATH
-          export PATH=/usr/local/opt/bison/bin:$PATH
           export PATH=/usr/local/opt/libtool/bin:$PATH
-
-          ln -sf /usr/local/opt/libtool/bin/glibtool /usr/local/opt/libtool/bin/libtool
-          ln -sf /usr/local/opt/libtool/bin/glibtoolize /usr/local/opt/libtool/bin/libtoolize
           ls -lha /usr/local/opt/libtool/bin/
 
           libtoolize --version
@@ -144,10 +138,6 @@ jobs:
       - name: Build
         run: |
           export PATH=${{ github.workspace }}/bin/runtime:$PATH
-          export PATH=/usr/local/opt/llvm/bin:$PATH
-          export PATH=/usr/local/opt/flex/bin:$PATH
-          export PATH=/usr/local/opt/bison/bin:$PATH
-          export PATH=/usr/local/opt/libtool/bin:$PATH
 
           bash make-install-deps.sh
 

diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -13,6 +13,14 @@
 
 - [https://github.com/jingjingxyk/build-static-privoxy/releases](https://github.com/jingjingxyk/build-static-privoxy/releases)
 
+## 立即使用 static privoxy
+
+```shell
+
+curl -fSL https://github.com/jingjingxyk/swoole-cli/blob/new_dev/setup-coturn-runtime.sh?raw=true | bash
+
+```
+
 ## 构建文档
 
 - [linux 版构建文档](docs/linux.md)

diff --git a/build-musl-enviroment-example.sh b/build-musl-enviroment-example.sh