Skip to content

test(assembly),deny: reduce merge drift from main#2985

Closed
huitseeker wants to merge 3 commits intonextfrom
prep/next-merge-reduction
Closed

test(assembly),deny: reduce merge drift from main#2985
huitseeker wants to merge 3 commits intonextfrom
prep/next-merge-reduction

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). Another PR against main (#2984) takes care of the rest.

Changes:

  • refresh the protocol kernel assembly fixtures to the current next-compatible shape
  • remove stale anstream / anstyle-parse skips from deny.toml

Notes:

  • I intentionally did not port the main-only exec.$kernel::init fixture lines
  • I also did not port the extra miden-core workspace wiring from main, because that currently breaks the packaging test on next

@huitseeker huitseeker requested a review from bobbinth April 9, 2026 16:42
@huitseeker huitseeker changed the title Prep/next merge reduction test(assembly),deny: reduce merge drift from main Apr 9, 2026
@huitseeker huitseeker added the no changelog This PR does not require an entry in the `CHANGELOG.md` file label Apr 9, 2026
@huitseeker huitseeker force-pushed the prep/next-merge-reduction branch from e350e84 to e6b409a Compare April 10, 2026 14:32
@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 prep/next-merge-reduction 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