测试禁用 Opcache，避免奇怪的失败问题 (#599)

* 测试禁用 Opcache * 修复 * 修复 kill 命令
imiphp · Oct 20, 2023 · cfd439f · cfd439f
1 parent e8d2a7a
commit cfd439f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -314,7 +314,7 @@ jobs:
           php-version: ${{ matrix.php }}
           tools: pecl
           extensions: >
-            apcu, bcmath, curl, openssl, mbstring, intl, json, redis, mysqli, pdo, pdo_mysql, sockets, zip,
+            apcu, bcmath, curl, openssl, mbstring, intl, json, redis, mysqli, pdo, pdo_mysql, sockets, zip, :opcache, 
             swoole-swoole/swoole-src@${{ matrix.swoole }}
         env:
           SWOOLE_CONFIGURE_OPTS: >
@@ -406,7 +406,7 @@ jobs:
         roadrunner: [2.7.*]
         extensions:
           [
-            "apcu, bcmath, curl, openssl, mbstring, intl, json, redis, mysqli, pdo, pdo_mysql, sockets",
+            "apcu, bcmath, curl, openssl, mbstring, intl, json, redis, mysqli, pdo, pdo_mysql, sockets, :opcache",
           ]
     env:
       IMI_ROADRUNNER_BINARY: ${{ github.workspace }}\rr.exe

diff --git a/src/Components/fpm/tests/HttpServer/bin/stop.sh b/src/Components/fpm/tests/HttpServer/bin/stop.sh
@@ -5,5 +5,5 @@ __DIR__=$(cd `dirname $0`; pwd)
 pidFile="$__DIR__/server.pid"
 
 if [ -f $pidFile ];then
-    kill $(cat $pidFile)
+    kill -15 $(cat $pidFile)
 fi
diff --git a/src/Components/workerman-gateway/tests/bootstrap.php b/src/Components/workerman-gateway/tests/bootstrap.php
@@ -131,7 +131,7 @@ function checkPort13002(): bool
                 $keyword = 'imi:master';
             }
             ttyExec(<<<CMD
-            kill `ps -ef|grep "{$keyword}"|grep -v grep|awk '{print $2}'`
+            kill -15 `ps -ef|grep "{$keyword}"|grep -v grep|awk '{print $2}'`
             CMD);
             echo 'WorkermanServers stoped!', \PHP_EOL, \PHP_EOL;
         });