Rewind exe analysis to the analyse-installshield feature (remove Qt & 7-Zip SFX)#30
Merged
Merged
Conversation
e8b39a9 to
55f2b4b
Compare
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.
Context
Request: "rebase main back to anthelion changes +
94da4ab(Suppress prompts when CI=true) +0a32118(feat/analyse-installshield-squashed)".main(a61e6c7) is a merge of two lineages:18616f9. The two named commits sit in the middle of this line:94da4ab(20th from the tip) and0a32118(21st, directly below it). ~19 newer devicie commits are stacked above them.#27merge.A literal "reset the devicie line back to
94da4ab" (dropping all ~19 commits above it) turns out not to be achievable as a clean, buildable change, because those commits are deeply entangled with the anthelion integration and with each other:serde_yamlvsserde-saphyr— the anthelion integration deliberately kept devicie'sserde_yaml/seriniand reverted anthelion'sserde-saphyr(Cargo.toml,manifests/mod.rs,commands/submit.rs). Re-merging onto94da4abreintroducesserde-saphyrcalls that won't compile (it isn't a dependency).innois dead — at94da4ab,innois patched to avendor/innogit submodule whose commits no longer exist on the remote (git submodule update --initfails). Commit00b46d0later moved to the publishedinno/msicrates specifically to unbreak CI.00b46d0also fixed a duplicatedInstaller { switches: … }struct field inmsi/mod.rs, akeyring_core::Entrymatch intoken.rs, and a fork-onlyinnoAPI. Reverting these reintroduces hard compile errors against the published crates.-D warnings— several files below the boundary use older idioms current clippy rejects (redundant_closureinsourceforge.rs,map_or→is_none_orinvanity_url.rs,collapsible_ifinprompts.rs).Also note: this build environment's toolchain is Rust 1.94.1 but the crate needs
rust-version = "1.95", so I could not build/clippy-verify locally — CI on this PR is the verification.What this PR does (the buildable subset)
Rewinds the exe installer-analysis set back to the analyse-installshield feature (
0a32118) by removing the two analysis features added after it — the cleanly separable, build-safe part of the rewind:Qt(Qt Installer Framework) andSevenZipSfxvariants, detection branches, and dispatch arms fromExeType/Exe.qtandsevenzip_sfxmodules and their re-exports.src/analysis/installers/qt.rsandsrc/analysis/installers/sevenzip_sfx.rs.Everything else (bug fixes, the published-crate build config, the anthelion integration) is retained so the tree still builds and passes clippy.
Question
Do you want:
94da4ab(NSIS/Inno/Burn/MSI parser fixes, autoupdate concurrency, published-crate migration, locale-publisher, thewinget-extras→winget-pkgsdefault change, etc.)?If (2), several of those changes must be retained (or re-applied) for the tree to compile and pass CI, as detailed above — so the result won't be a byte-for-byte
94da4abtree. Happy to iterate once you confirm the direction.🤖 Generated with Claude Code
Generated by Claude Code