Repository navigation
Sync rocicorp/mono main (3933b71) - #193
Merged
Merged
Conversation
Mono-Internal-Commit: bb68910b6e4b3d1fa799ac3173d9cbbb5a6ccbba
Mono-Internal-Commit: f8c8844022417d0dda47c9545013c6cf720f8a09
Mono-Internal-Commit: 49a01b16eb0c9f21e1aa3ba915d66ad26b53850f
Mono-Internal-Commit: 327bf34bfb648f87ac4c01e74cafb5e20c96eebc
Mono-Internal-Commit: 135f3189e1b18fbb8af9087bfc3bc2090d821d2d
Mono-Internal-Commit: b8288c8838cdf6889e6501e9d2a4461b173d06bd
Mono-Internal-Commit: 93bd67166fdf42e5e27cdde67f116ec2ed01a58d
Mono-Internal-Commit: 3bcbe924a1cb9a3d9ae5846d1a5533dc2f5ccc74
Mono-Internal-Commit: efd3b5bbdb30526eea3774909deb4ae2db002df8
Mono-Internal-Commit: 8556d697d64859cdac3df6dbb9d3366187b9b6d7
Mono-Internal-Commit: 850f6e16a884d549629e43881af63daefec19982
Upstream's 5204bd2 moves @rocicorp/zero-previous to npm:@rocicorp/zero@1.12.0 in pnpm-lock.yaml. tools/restored-tests/align-manifests.mjs sets the restored zql-integration-tests manifest to match, so pnpm install --frozen-lockfile passes. Amp-Thread-ID: https://ampcode.com/threads/T-c513a037-a257-45e0-b9a9-15c15edfe859 Co-authored-by: tmm <tmm@tmm.dev>
…r the full 5 s Pins the third case of upstream a5a9403's zero.test.ts test: a Rehome with no maxBackoffMs reconnects after RUN_LOOP_INTERVAL_MS, because an error the server sends keeps the full interval rather than the faster transport-failure backoff. Amp-Thread-ID: https://ampcode.com/threads/T-c513a037-a257-45e0-b9a9-15c15edfe859 Co-authored-by: tmm <tmm@tmm.dev>
|
Review the following changes in direct dependencies. Learn more about Socket for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Land with a merge commit, not a squash.
11 upstream commits,
836f22e..3933b71, merged with no conflicts. The merge touches no file restored by #188 (tools/restored-tests/verbatim.txthashes all match).Client-relevant
None.
zero-client,zero-protocol,zql,zero-schema,zero-types,sharedandreplicacheare unchanged, and the protocol version stays at 57. The only change in a package the client builds on is a log line inzqlite(97c81ad).Server-only
PRIVATE_JWK, which zbugs-swift'sserver.tsalready sets.release.yml). Every job still waits onplan, which only runs inrocicorp/mono, so the workflow stays off in this fork.RMv2 default (f3a60cf)
ZERO_UPSTREAM_PG_HIGH_AVAILABILITY_REPLICATIONis now on by default. zbugs-swift's single-node backend sets no Litestream backup URL and doesn't usediscovermode, so it still starts, but its change log moves from Postgres to SQLite. The Swift end-to-end jobs (Linux and macOS) run against it. tmm's Mac backend needs a pull and a restart after this merges to pick up the new default.Lockfile follow-up
node tools/restored-tests/align-manifests.mjs. 5204bd2 moves@rocicorp/zero-previoustonpm:@rocicorp/zero@1.12.0inpnpm-lock.yaml, and the script sets the restoredpackages/zql-integration-tests/package.jsonto match. Only that one specifier changes.pnpm install --frozen-lockfilethen passes, with the lockfile unchanged.Test-only follow-up
zero.test.tstest: a Rehome with nomaxBackoffMsreconnects afterRUN_LOOP_INTERVAL_MS, because an error the server sends keeps the full interval rather than the faster transport-failure backoff. In the vector, advancing 4999 ms opens no socket and the next 1 ms opens one. Swift already behaves this way. With Swift'sEnginechanged to use the transport-failure backoff for server errors, this vector fails, along with "ServerOverloaded with both bounds".Checks run
zero-conformance: generate on the plain merge (vectors byte-identical), then again with the new scenario (only that one case added toclient.json); test, check-types, check-format and lint.zero-swift-cli: test (29/29) and check-types.pnpm exec syncpack lint.No changeset: nothing in the Swift package changes. Land with a merge commit so upstream stays an ancestor of main.