From 660fd861429ca6904fd6ef9f9b591a37bba315b1 Mon Sep 17 00:00:00 2001 From: Prem Palanisamy Date: Sun, 5 Apr 2026 18:40:16 +0100 Subject: [PATCH] Restore original 1.9.x matrix logic and realtime test --- .github/workflows/ci.yml | 5 ++--- .../Realtime/RealtimeCustomClientTest.php | 15 +-------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b762b10c37..4e18faee4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -191,7 +191,7 @@ jobs: const allDatabases = ['MariaDB', 'PostgreSQL', 'MongoDB']; const allModes = ['dedicated', 'shared_v1', 'shared_v2']; - const defaultDatabases = ['MariaDB']; + const defaultDatabases = ['MongoDB']; const defaultModes = ['dedicated']; const pr = context.payload.pull_request; @@ -218,8 +218,7 @@ jobs: const decode = (content) => JSON.parse(Buffer.from(content, 'base64').toString()); const databaseChanged = getDbVersion(decode(base.content)) !== getDbVersion(decode(head.content)); - // Like cloud: database version change expands modes only, not engines - core.setOutput('databases', JSON.stringify(defaultDatabases)); + core.setOutput('databases', JSON.stringify(databaseChanged ? allDatabases : defaultDatabases)); core.setOutput('modes', JSON.stringify(databaseChanged ? allModes : defaultModes)); build: diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php index 03723bf231..f6200ed209 100644 --- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php +++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php @@ -3039,21 +3039,8 @@ class RealtimeCustomClientTest extends Scope $this->assertEquals(200, $update['headers']['status-code']); - // Drain WebSocket messages until the .update event arrives. - // Earlier events (e.g. a late-arriving .create from the row seed above) are skipped. - $updateEvent = "tablesdb.{$databaseId}.tables.{$tableId}.rows.{$rowId}.update"; - $event = null; - $deadline = \time() + 10; - while (\time() < $deadline) { - $raw = $client->receive(); - $msg = json_decode($raw, true); - if (($msg['type'] ?? '') === 'event' && \in_array($updateEvent, $msg['data']['events'] ?? [])) { - $event = $msg; - break; - } - } + $event = json_decode($client->receive(), true); - $this->assertNotNull($event, 'Timed out waiting for the row update event'); $this->assertArrayHasKey('type', $event); $this->assertArrayHasKey('data', $event); $this->assertEquals('event', $event['type']);