Skip to content

fix: preassembled runtime deps on main#2984

Closed
huitseeker wants to merge 3 commits intomainfrom
fix/preassembled-runtime-deps-on-main
Closed

fix: preassembled runtime deps on main#2984
huitseeker wants to merge 3 commits intomainfrom
fix/preassembled-runtime-deps-on-main

Conversation

@huitseeker
Copy link
Copy Markdown
Collaborator

@huitseeker huitseeker commented Apr 9, 2026

This is merge-prep for the upcoming main -> next reconciliation (see #2878).

#2950 contained some adjustments of the package PR (originally #2877) for next.

The present PR cherry-picks those adjustments to main, and is by consequence expected to remove 5 of the 18 conflicts on the tracking release branch. Another PR against next (#2985) will take care of the rest.

Preassembled packages still need their runtime dependencies during resolution. Programs that need a kernel now fail when that kernel cannot be resolved, instead of silently falling back to embedded metadata during dependency selection.

(cherry picked from commit a5bebe9)
@huitseeker huitseeker requested a review from bobbinth April 9, 2026 15:52
@huitseeker huitseeker added the no changelog This PR does not require an entry in the `CHANGELOG.md` file label Apr 9, 2026
These protocol fixture deltas were introduced on main in 972f916
(test(assembly): add integration test for project assembly), after
main and next had already diverged.

Next already carries the protocol fixtures via #2877, but with different
fixture semantics, and later rejects direct `exec.$kernel::init`
references after cf48d0a (#2903).

Remove the main-only `exec.$kernel::init` lines and the extra
`miden-core` workspace wiring from the protocol fixtures. The
packaging test still passes, and this eliminates the remaining
fixture-only merge conflicts with next.
@huitseeker
Copy link
Copy Markdown
Collaborator Author

Will do something simpler.

@huitseeker huitseeker closed this Apr 13, 2026
huitseeker added a commit that referenced this pull request Apr 13, 2026
Resolve the remaining drift per PR #2984 and PR #2985 by keeping next's package-assembly state and next-specific protocol fixture semantics.
huitseeker added a commit that referenced this pull request Apr 13, 2026
Resolve the remaining drift per PR #2984 and PR #2985 by keeping next's package-assembly state and next-specific protocol fixture semantics.
@huitseeker huitseeker mentioned this pull request Apr 13, 2026
@huitseeker
Copy link
Copy Markdown
Collaborator Author

Replaced by #2998

@bobbinth bobbinth deleted the fix/preassembled-runtime-deps-on-main branch April 29, 2026 01:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no changelog This PR does not require an entry in the `CHANGELOG.md` file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant