Skip to content

Commit 4248fe7

Browse files
committed
Fix CI
1 parent 16a9122 commit 4248fe7

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

.github/workflows/framework.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
php-version: [ '8.1', '8.2', '8.3' ]
19-
framework: [ 'Laravel Octane', 'Hyperf', 'Simps', 'imi' ]
19+
framework: [ 'Laravel Octane', 'Hyperf', 'Simps' ]
2020
name: ${{ matrix.framework }} - PHP ${{ matrix.php-version }}
2121
steps:
2222
- name: Checkout code
@@ -83,23 +83,6 @@ jobs:
8383
composer install -o
8484
composer test
8585
86-
- name: imi Tests
87-
if: matrix.framework == 'imi'
88-
env:
89-
MYSQL_VERSION: '5.7'
90-
MYSQL_SERVER_PASSWORD:
91-
run: |
92-
docker run --name mysql -d -p 3306:3306 --health-cmd="mysqladmin ping --silent" --health-interval=1s --health-retries=60 --health-timeout=3s -e MYSQL_ALLOW_EMPTY_PASSWORD=true mysql:${MYSQL_VERSION} --bind-address=0.0.0.0 --default-authentication-plugin=mysql_native_password
93-
docker run --name redis -d -p 6379:6379 redis
94-
docker run --name rabbitmq -d -p 4369:4369 -p 5672:5672 -p 15672:15672 -p 25672:25672 rabbitmq:management-alpine
95-
git clone -b 2.1 https://github.com/imiphp/imi.git --depth=1
96-
cd imi/
97-
composer update -o
98-
timeout 60s sh -c 'until docker ps | grep mysql | grep -q healthy; do echo "Waiting for container to be healthy..."; sleep 1; done'
99-
mysql -h 127.0.0.1 -u root -e "CREATE DATABASE IF NOT EXISTS db_imi_test charset=utf8mb4 collate=utf8mb4_unicode_ci;"
100-
./tests/db/install-db.sh
101-
composer test-swoole
102-
10386
macos:
10487
if: "!contains(github.event.head_commit.message, '[test]')"
10588
runs-on: macos-latest

include/swoole_coroutine.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,9 @@ class Coroutine {
266266
if (sw_unlikely(count() > peak_num)) {
267267
peak_num = count();
268268
}
269+
if (!activated) {
270+
activate();
271+
}
269272
}
270273

271274
Coroutine(long _cid, const CoroutineFunc &fn, void *private_data) : ctx(stack_size, fn, private_data) {

0 commit comments

Comments
 (0)