Skip to content

fix(stella-pipeline,make): unbreak main — witness-stage merge clobber and a duplicate Makefile target #1904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macanderson merged 1 commit into from
Aug 6, 2026
+4 −8
Merged

fix(stella-pipeline,make): unbreak main — witness-stage merge clobber and a duplicate Makefile target #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,10 +344,6 @@ releases-baseline-update: ## Grandfather the tags that shipped nothing and never
releases-published-test: ## Test the tag/release reconciliation rule (hermetic; not part of `gate`)
./scripts/test-releases-published.sh

.PHONY: guard-sigpipe-test
guard-sigpipe-test: ## Test that the gate guards survive a reader that closes their pipe early (#1815; hermetic; not part of `gate`)
./scripts/test-guard-sigpipe.sh

.PHONY: hooks
hooks: ## Install the pre-push gate hook (runs `make gate`, scoped to the diff, on every push)
git config core.hooksPath .githooks
Expand Down
8 changes: 4 additions & 4 deletions crates/stella-pipeline/src/pipeline/witness_stage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ impl<'a> Pipeline<'a> {
TurnOutcome::Aborted {
reason, cost_usd, ..
} => {
*total += cost_usd;
*spend.total += cost_usd;
// A budget stop here is degradable too (#1789): the worker's
// change is already complete in the candidate, and discarding
// it because the SCAFFOLDING ran out of money threw away real
Expand All @@ -346,7 +346,7 @@ impl<'a> Pipeline<'a> {
// the next unaffordable call; what degrading buys is the
// deterministically-resolvable endings (a warranted waiver,
// an abstention) that need no further model spend at all.
if let Some(abort) = budget_abort(budget.evaluate()) {
if let Some(abort) = budget_abort(spend.budget.evaluate()) {
return Err(WitnessAbort::degradable(format!(
"witness authoring stopped by the budget ({}); the executed change \
stands unproven",
Expand Down Expand Up @@ -433,10 +433,10 @@ impl<'a> Pipeline<'a> {
TurnOutcome::Aborted {
reason, cost_usd, ..
} => {
*total += cost_usd;
*spend.total += cost_usd;
// Degradable for the same #1789 reason as the author
// turn's budget arm above.
if let Some(abort) = budget_abort(budget.evaluate()) {
if let Some(abort) = budget_abort(spend.budget.evaluate()) {
return Err(WitnessAbort::degradable(format!(
"witness repair stopped by the budget ({}); the executed change \
stands unproven",
Expand Down