Skip to content

fix(fork): merge upstream 85e009f into patch/desktop-update-capability - #272

Merged
fireboltdude1357 merged 1048 commits into
patch/desktop-update-capabilityfrom
fix/desktop-update-capability-upstream-85e009f
Nov 14, 2026
Merged

fireboltdude1357 merged 1048 commits into
patch/desktop-update-capabilityfrom
fix/desktop-update-capability-upstream-85e009f

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/desktop-update-capability conflicts with upstream 85e009f in apps/server/src/desktopUpdate/DesktopAppUpdate.test.ts.

Upstream pingdotgg#33605 adds a test for joining a retry to an already downloaded update. The patch adds its "is unavailable when the desktop app reports it cannot update itself" test in the same spot, and git interleaved the two. I rebuilt the file from upstream's version and re-added the patch's three changes whole: the harness's desktopAppUpdate option, its true default, and its test. Compared with upstream, the file gains exactly those 9 lines.

On a scratch stack of upstream 85e009f with all 26 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the 49 test files the patches touch (1449 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 14, 2026 00:54
…ngdotgg#24047)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Aatman Jain <lives@MacBook-Pro.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…36588)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…6590)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#25445)

Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#24045)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#25472)

Co-authored-by: Abid A Gafoor <40262245+sgaabdu4@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…indows (pingdotgg#24006)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36561)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25874)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36602)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nel (pingdotgg#36606)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36610)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36604)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#25858)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#26069)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36584)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#36608)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Yuruzuu and others added 29 commits November 14, 2026 10:29
…moved (pingdotgg#29155)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…from an earlier hand-off (pingdotgg#35258)

Co-authored-by: Mika Hertler <mika@mikahertler.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…renamed or switched (pingdotgg#34984)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#34775)

Co-authored-by: kumar-karan <kumar-karan@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…of failing (pingdotgg#34698)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…35304)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ays as strings (pingdotgg#34576)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… starts (pingdotgg#34621)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rives (pingdotgg#35117)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…it status refresh (pingdotgg#32349)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…te completion (pingdotgg#34620)

Co-authored-by: Apex-ICP <jesse@apexicp.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… thread (pingdotgg#34990)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ider switch (pingdotgg#34498)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ranch (pingdotgg#34452)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…34308)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…subsequences (pingdotgg#26376)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ngdotgg#35122)

Co-authored-by: user <user@qubes-os.org>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#34402)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36876)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#34670)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ndoned turns (pingdotgg#34639)

Co-authored-by: Ali-Al1 <Ali-Al1@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…top-update-capability-upstream-85e009f

# Conflicts:
#	apps/server/src/desktopUpdate/DesktopAppUpdate.test.ts
@fireboltdude1357
fireboltdude1357 merged commit 7baac07 into patch/desktop-update-capability Nov 14, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.