fix(download): persist toolset archives in a predictable cache path#9861
Merged
Conversation
…o repeated builds and offline environments skip the @electron/get network round-trip
🦋 Changeset detectedLatest commit: 10321bd The changes in this PR will be included in the next version bump. This PR includes changesets to release 8 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
mmaietta
added a commit
that referenced
this pull request
Jun 10, 2026
…ache persistence
Merge conflicts resolved in favor of this branch's cascade-006 changes:
- configuration.ts: keep `nativeModules?: NativeModulesConfig` (not flat npmRebuild/nativeRebuilder)
- scheme.json: keep NativeModulesConfig $ref, drop top-level npmRebuild/nodeGypRebuild/snap entries
- yarn.ts: keep config.nativeModules?.rebuildMode (not config.nativeRebuilder)
- coreLegacy.ts: keep SnapOptionsLegacy import (SnapOptions was renamed)
- SnapTarget.ts: keep { base: "core24" } default (new default from cascade-006)
- LinuxTargetHelper.ts: keep SnapCore24 default routing with electron version guards
Also adds resolveFromArchiveCache + persistToArchiveCache to downloadBuilderToolset
(backport of fix #9861 that was missing from this branch). All three CI shards
(Linux/macOS/Windows) failed with the same two tests in electronGetTest.ts::toolset
archive cache — both now pass (39/39 locally).
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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.
Fixes: #9860
<ELECTRON_BUILDER_CACHE>/<releaseName>/<filename>alongside the extracted directory. On every subsequent build it checks this path first; if the archive is present (and its SHA-256 checksum matches when one is configured) the download and all@electron/getinteraction is skipped entirely — no network call, no progress bar, no lock contention.filenameWithExtpath-traversal guard —downloadBuilderToolsetrejects filenames containing/,\, or..before any I/O.