Fix for windows update channel - #54
Merged
Merged
Conversation
Add rust caches in CI. Add scheduler cleanup during install on windows
|
ⓘ Qodo reviews are paused because the subscription is no longer active. Ask your workspace admin to reactivate the subscription to resume reviews. Manage billing |
There was a problem hiding this comment.
1 issue found across 4 files
Prompt for AI agents (unresolved issues)
Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.
<file name="packages/desktop/scripts/merge-win-update-manifest.cjs">
<violation number="1" location="packages/desktop/scripts/merge-win-update-manifest.cjs:93">
P3: In the per-arch count failure, `matches` is now `byArch.get(arch)` yet the message lists every merged file via `files.map(...)`. List only the failing arch's bucket (`matches`) so the message identifies which installer is short or duplicated; the current output obfuscates the offending arch.</violation>
</file>
Reply with feedback, questions, or to request a fix.
Re-trigger cubic
| } | ||
| for (const arch of ARCHES) { | ||
| const matches = files.filter((f) => f.url.includes(arch)) | ||
| const matches = byArch.get(arch) |
There was a problem hiding this comment.
P3: In the per-arch count failure, matches is now byArch.get(arch) yet the message lists every merged file via files.map(...). List only the failing arch's bucket (matches) so the message identifies which installer is short or duplicated; the current output obfuscates the offending arch.
Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At packages/desktop/scripts/merge-win-update-manifest.cjs, line 93:
<comment>In the per-arch count failure, `matches` is now `byArch.get(arch)` yet the message lists every merged file via `files.map(...)`. List only the failing arch's bucket (`matches`) so the message identifies which installer is short or duplicated; the current output obfuscates the offending arch.</comment>
<file context>
@@ -75,9 +75,22 @@ for (const file of [...x64.files, ...arm64.files]) {
+}
for (const arch of ARCHES) {
- const matches = files.filter((f) => f.url.includes(arch))
+ const matches = byArch.get(arch)
if (matches.length !== 1) {
fail(`expected exactly 1 ${arch} installer in the merged manifest, found ${matches.length}: ` +
</file context>
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.
Summary by cubic
Ensure Windows updates always use a merged manifest and never offer the wrong installer. Previously, a build leg could upload a plain latest.yml/beta.yml that caused arm64 users to get the x64 installer; now only a merge job creates the plain manifest from per‑arch manifests.
Key changes
latest-x64/latest-arm64andbeta-x64/beta-arm64; each leg writeslatest-x64.yml/latest-arm64.ymlorbeta-x64.yml/beta-arm64.yml.windows-manifestthe sole writer oflatest.yml/beta.ymlby merging the two per‑arch manifests; workflows now download suffixed files and upload the merged unsuffixed manifest.scripts/merge-win-update-manifest.cjsto require exactly one installer per arch and reject any URL that matches zero or multiple arch tokens.updateManager.tsthat clients poll the unsuffixed channel;GitHubProviderand environment pinning take precedence over app‑baked channels, andelectron-updaterselects byprocess.arch.Written for commit ac3a0ea. Summary will update on new commits.