Merged
Conversation
…ingdotgg#2176) (cherry picked from commit 7da6522)
Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit 22b7d8c)
Co-authored-by: codex <codex@users.noreply.github.com> (cherry picked from commit 02903f2)
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: codex <codex@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> (cherry picked from commit 9acf46a)
(cherry picked from commit 86c94b4)
…gdotgg#1293) Co-authored-by: Murat Aslan <murataslan1@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> (cherry picked from commit a4298f1)
…layout fixes (pingdotgg#2392) Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> (cherry picked from commit d649ccf)
…endencies (pingdotgg#2427) (cherry picked from commit c07ac59)
) Co-authored-by: Claude Haiku 4.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> (cherry picked from commit 4ef361d)
(cherry picked from commit 1eb6fce)
Cycle baseline 9e2182c → dc9f2bf. Ports 14 upstream PRs (pingdotgg#2176, pingdotgg#2408, pingdotgg#2411, pingdotgg#2404, pingdotgg#1652, pingdotgg#1966, pingdotgg#2413, pingdotgg#1293, pingdotgg#2423, pingdotgg#2409, pingdotgg#2392, pingdotgg#2427, pingdotgg#2420, pingdotgg#2183), captures conflict resolutions, marks pingdotgg#2419 as already-equivalent under MarCode's md:-breakpoint pattern, and defers pingdotgg#2277 (Multi-Provider) per user instruction. Adds skip entries for upstream-only docs (pingdotgg#2154 README, pingdotgg#2425 VOUCHED.td).
PR #81's run hit the 10-minute cap during the post-job cache uploads (Playwright 261MB + Turbo 328MB at ~2 MB/s on hosted runners). The actual quality work — fmt/lint/typecheck/test/browser/build — finished in 8m25s; the timeout fired during the second cache save, mid-stream. Recent main pushes have been creeping toward the limit (7m24s, 7m28s, 8m0s for PR #80) so the cap was already on the edge before this PR's extra upstream-sync work pushed it over. Bumping to 15 leaves headroom without trading away the safety net entirely. The release_smoke job stays at 10 — it consistently runs in ~1m and isn't affected by the cache layer.
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
12 participants
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.
Summary
40.9.3, and recorded the 2026-05-01 upstream quick-fix cycle inUPSTREAM_DIVERGENCE.md.Testing