fix(stella-pipeline,make): unbreak main — witness-stage merge clobber and a duplicate Makefile target - #1904
Merged
Conversation
… and a duplicate Makefile target Two of the ~20 PRs merged untested during the GitHub Actions outage collided semantically: - witness_stage.rs: the Spend-struct refactor and #1789's degradable budget-abort arms merged textually clean but never met — both Aborted arms still referenced the pre-refactor `total`/`budget` bindings (E0425 x4), so stella-pipeline stopped compiling, taking lint, test, doc-warnings and the wire-schema exporter down with it. Align the arms with their sibling Completed arms: `*spend.total` / `spend.budget.evaluate()`. - Makefile: PR #1844 and stacked PR #1881 each added the identical guard-sigpipe-test target, and make warns about the override on every invocation. Keep one. The witness for the pipeline half is the whole existing witness-stage test suite, which cannot even compile on main today; no new test is honest here (this restores intent both parents already tested). Remaining main breaks are fixed in sibling PRs: the toolset.rs god-file split + mcp rustdoc link (split PR), tracked from the gate run log.
Contributor
There was a problem hiding this comment.
Sorry @macanderson, you have reached your weekly rate limit of 500000 diff characters.
Please try again later or upgrade to continue using Sourcery
Contributor
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
Contributor
Reviewer's guide (collapsed on small PRs)Reviewer's GuideFixes compilation in stella-pipeline’s witness_stage by wiring aborted-turn accounting to the new Spend struct fields, and removes a duplicated Makefile target that was causing override warnings. File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
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.
Problem
Local
make gateon main (11c4ca1e) after the ~20-PR merge flurry (merged untested during the GitHub Actions outage, #1899) found stella-pipeline does not compile: the Spend-struct refactor and #1789's degradable budget-abort arms merged textually clean but semantically never met — bothAbortedarms inwitness_stage.rsstill referenced the pre-refactortotal/budgetbindings (E0425 ×4). This one break cascades:lint,test,doc-warnings, and thewire-schemaserve-frame exporter all go red behind it.Separately, PR #1844 and its stacked PR #1881 each added the identical
guard-sigpipe-testMakefile target, so everymakeinvocation warns about the override.Fix
Abortedarms with their siblingCompletedarms:*spend.total += cost_usdandbudget_abort(spend.budget.evaluate()). Restores exactly the intent both parent PRs tested independently.Verification (local — Actions is in a major outage, stated per policy)
cargo check -p stella-pipeline -j 2: clean (main: E0425 ×4).cargo test -p stella-pipeline -j 2 witness: 123 passed, 0 failed — the entire witness-stage suite, which cannot even compile on main, is the witness here; a new test would be dishonest (no new behavior, only the restoration of two intents that were each already tested).cargo clippy -p stella-pipeline --all-targets -- -D warnings: clean.makeno longer emits the override warning.Remaining main breaks (sibling PRs, from the same gate run)
toolset.rsnew god file (1756 > 1500) + theMAX_SERVER_SCHEMA_BYTES→ privatecrate::client::ingestrustdoc link — in the toolset split PR.Refs #1899.
Summary by Sourcery
Fix witness-stage budget handling after a spend-struct refactor and clean up a duplicate Makefile target.
Bug Fixes:
Build: