From cfd439f6268ae08fbdff7e698910a8aa872991f0 Mon Sep 17 00:00:00 2001
From: Yurun <admin@yurunsoft.com>
Date: Fri, 20 Oct 2023 16:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=A6=81=E7=94=A8=20Opcache?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=A5=87=E6=80=AA=E7=9A=84=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=20(#599)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 测试禁用 Opcache

* 修复

* 修复 kill 命令
---
 .github/workflows/ci.yml                             | 4 ++--
 src/Components/fpm/tests/HttpServer/bin/stop.sh      | 2 +-
 src/Components/workerman-gateway/tests/bootstrap.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 520f626e2a..58f2df44a9 100644
--- 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
index 5105bd2f68..375dfab037 100755
--- 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
\ No newline at end of file
diff --git a/src/Components/workerman-gateway/tests/bootstrap.php b/src/Components/workerman-gateway/tests/bootstrap.php
index d0b63093eb..14edb4a221 100644
--- 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;
         });