Skip to content

Commit 0ad07ad

Browse files
Revert CI worker capture instrumentation
1 parent 39e6839 commit 0ad07ad

2 files changed

Lines changed: 3 additions & 32 deletions

File tree

.github/workflows/php.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,24 +82,20 @@ jobs:
8282
DB_CONNECTION: mysql
8383
DB_PORT: ${{ job.services.mysql.ports[3306] }}
8484
QUEUE_CONNECTION: redis
85-
WORKFLOW_TEST_CAPTURE_WORKER_OUTPUT: 1
8685

8786
- name: Run test suite (PostgreSQL)
8887
run: vendor/bin/phpunit --testdox --debug --testsuite feature
8988
env:
9089
DB_CONNECTION: pgsql
9190
DB_PORT: ${{ job.services.postgres.ports[5432] }}
9291
QUEUE_CONNECTION: redis
93-
WORKFLOW_TEST_CAPTURE_WORKER_OUTPUT: 1
9492

9593
- name: Upload laravel.log if tests fail
9694
if: failure()
9795
uses: actions/upload-artifact@v4
9896
with:
9997
name: laravel-log
100-
path: |
101-
vendor/orchestra/testbench-core/laravel/storage/logs/laravel.log
102-
vendor/orchestra/testbench-core/laravel/storage/logs/workflow-test-worker-*.log
98+
path: vendor/orchestra/testbench-core/laravel/storage/logs/laravel.log
10399

104100
- name: Code Coverage
105101
run: |

tests/TestCase.php

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,8 @@ public static function setUpBeforeClass(): void
4343

4444
for ($i = 0; $i < self::NUMBER_OF_WORKERS; $i++) {
4545
self::$workers[$i] = new Process(['php', __DIR__ . '/../vendor/bin/testbench', 'queue:work']);
46-
if (! self::shouldCaptureWorkerOutput()) {
47-
self::$workers[$i]->disableOutput();
48-
self::$workers[$i]->start();
49-
continue;
50-
}
51-
52-
file_put_contents(self::workerLogPath($i), '');
53-
54-
self::$workers[$i]->start(static function (string $type, string $output) use ($i): void {
55-
file_put_contents(self::workerLogPath($i), $output, FILE_APPEND | LOCK_EX);
56-
});
46+
self::$workers[$i]->disableOutput();
47+
self::$workers[$i]->start();
5748
}
5849
}
5950

@@ -103,20 +94,4 @@ protected function getPackageProviders($app)
10394
{
10495
return [\Workflow\Providers\WorkflowServiceProvider::class];
10596
}
106-
107-
private static function shouldCaptureWorkerOutput(): bool
108-
{
109-
$value = getenv(
110-
'WORKFLOW_TEST_CAPTURE_WORKER_OUTPUT'
111-
) ?: ($_ENV['WORKFLOW_TEST_CAPTURE_WORKER_OUTPUT'] ?? null);
112-
113-
return in_array($value, ['1', 'true', 'yes', 'on'], true);
114-
}
115-
116-
private static function workerLogPath(int $worker): string
117-
{
118-
return dirname(
119-
__DIR__
120-
) . '/vendor/orchestra/testbench-core/laravel/storage/logs/workflow-test-worker-' . $worker . '.log';
121-
}
12297
}

0 commit comments

Comments
 (0)