Repository navigation
Forward-port #919 (Go e2e flake) and #913 (release-branch CI) to master - #920
Merged
Merged
Conversation
…ream (#919) TestE2EWatchSetLoaderRebuildsFromTruthOnReconnect failed most runs (7 of 10 locally, and in 11 of the 18 failed CI runs since 2026-09-24). Its priming loop stopped at the first ScriptMatched for its payment, which is usually the mempool match, and an unconfirmed match carries no cursor. The test then cut the transport, often before the confirmed match from the block payTo mines had reached the pump. The watch was left with no resume cursor, so the reconnect sent no SetCursor and the wait for CursorAccepted saw only heartbeats until its deadline. Every failing run had a nil ResumeCursor at the cut; every passing run had one. Wait for the confirmed match, as primeRW already does for the same reason. 30 of 30 local runs pass. Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 9c7eb02)
ci.yml ran on pull requests and on pushes to master only, so nothing tested release/0.6 after a merge. A PR is tested as head-merged-into-base at event time, and an --admin merge can land on top of a fix that merged after that run, so the 0.6.x branch could reach a tag with a combination no CI run had built. Pushes to release/** now get the same Tests and Lint run as master pushes. seed-cache stays master-only, and push runs are still never cancelled. Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> (cherry picked from commit 85b704e)
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
1 participant
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.
Brings two
release/0.6merges back tomaster, one commit each, cherry-picked with-x:9c7eb02e): fixes the Go e2e flakeTestE2EWatchSetLoaderRebuildsFromTruthOnReconnect. The test cut its stream before the watch held a resume cursor, so the reconnect sent noSetCursorand the wait forCursorAcceptedtimed out. It now waits for the confirmed match, asprimeRWdoes. The flake is in 11 of the 18 failedci.ymlruns since 2026-09-24, master pushes included.85b704e9):ci.ymlalso runs on pushes torelease/**. Onmasterthis changes nothing formasterpushes. It means a futurerelease/0.7, cut frommaster, gets post-merge CI from the start. Merging ci: run Tests and Lint on pushes to release branches #913 started the first such run onrelease/0.6.Each file's patch matches the one on
release/0.6. Neither change needs a changelog entry: one is test-only, the other CI-only.Verified
satdbuilt from this branch,TestE2EWatchSetLoaderRebuildsFromTruthOnReconnectpassed 10 of 10 runs (go test -tags e2e -count=10).scripts/ci/check-workflow-run-syntax.py: 174 run blocks parsed, 0 failed.ci.ymlparses withpush.branches=['master', 'release/**'].Merging
"Rebase and merge" keeps the two commits separate, each with its
cherry picked fromline.🤖 Generated with Claude Code