Skip to content

chore: replace dead BOOTSTRAP_TO env var with bootstrap.sh build arg#21744

Merged
spalladino merged 1 commit intomerge-train/spartanfrom
chore/replace-bootstrap-to-with-build-arg
Mar 18, 2026
Merged

chore: replace dead BOOTSTRAP_TO env var with bootstrap.sh build arg#21744
spalladino merged 1 commit intomerge-train/spartanfrom
chore/replace-bootstrap-to-with-build-arg

Conversation

@spalladino
Copy link
Contributor

Motivation

BOOTSTRAP_TO=yarn-project ./bootstrap.sh was used in several places to build up to yarn-project, but the env var is no longer read by any code — it became dead after the Makefile introduction. Running it just runs a full ./bootstrap.sh ignoring the variable entirely.

Approach

Replace all occurrences with ./bootstrap.sh build yarn-project, which calls prep (submodule update + toolchain checks) then make yarn-project.

Changes

  • bootstrap.sh: Replace in ci-docs case
  • container-builds/avm-fuzzing-container/src/Dockerfile: Replace in build step
  • yarn-project/CLAUDE.md: Update developer instructions
  • .claude/skills/{backport,fix-pr,rebase-pr}: Update skill instructions

BOOTSTRAP_TO=yarn-project was used to build up to yarn-project, but the
env var is no longer read by any code. Replace with the working
`./bootstrap.sh build yarn-project` invocation.
@spalladino spalladino enabled auto-merge (squash) March 18, 2026 15:56
@spalladino spalladino merged commit e68eb57 into merge-train/spartan Mar 18, 2026
19 of 23 checks passed
@spalladino spalladino deleted the chore/replace-bootstrap-to-with-build-arg branch March 18, 2026 16:07
@AztecBot
Copy link
Collaborator

❌ Failed to cherry-pick to v4-next due to conflicts. (🤖) View backport run.

AztecBot pushed a commit that referenced this pull request Mar 18, 2026
…bootstrap.sh build arg (#21744)

Conflicts:
- .claude/skills/backport/SKILL.md (modify/delete)
- bootstrap.sh (content conflict)
AztecBot pushed a commit that referenced this pull request Mar 18, 2026
…bootstrap.sh build arg (#21744)

Conflicts:
- .claude/skills/backport/SKILL.md (modify/delete)
- bootstrap.sh (content conflict)
spalladino added a commit that referenced this pull request Mar 18, 2026
…trap.sh build arg (#21748)

## Summary

Backport of #21744
to v4-next.

Replaces all occurrences of the dead `BOOTSTRAP_TO=yarn-project
./bootstrap.sh` env var with `./bootstrap.sh build yarn-project`, which
actually calls `prep` then `make yarn-project`.

## Conflicts resolved

- **bootstrap.sh**: v4-next had already removed the `BOOTSTRAP_TO`
prefix but left bare `./bootstrap.sh` — resolved to `./bootstrap.sh
build yarn-project`
- **.claude/skills/backport/SKILL.md**: doesn't exist on v4-next
(deleted in modify/delete conflict)

## Changes

- `bootstrap.sh`: fix ci-docs build command
- `container-builds/avm-fuzzing-container/src/Dockerfile`: fix build
step
- `yarn-project/CLAUDE.md`: update developer instructions
- `yarn-project/.claude/skills/{fix-pr,rebase-pr}/SKILL.md`: update
skill instructions

ClaudeBox log: https://claudebox.work/s/e50c1cdccd277aa9?run=1

---------

Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com>
github-merge-queue bot pushed a commit that referenced this pull request Mar 18, 2026
BEGIN_COMMIT_OVERRIDE
fix(p2p): fall back to maxTxsPerCheckpoint for per-block tx validation
(#21605)
chore: fixing M3 devcontainer builds (#21611)
fix: clamp finalized block to oldest available in world-state (#21643)
chore: fix proving logs script (#21335)
fix: (A-649) tx collector bench test (#21619)
fix(validator): process block proposals from own validator keys in HA
setups (#21603)
fix: add bounds when allocating arrays in deserialization (#21622)
fix: skip handleChainFinalized when block is behind oldest available
(#21656)
chore: demote finalized block skip log to trace (#21661)
fix: skip -march auto-detection for cross-compilation presets (#21356)
chore: revert "add bounds when allocating arrays in deserialization"
(#21622) (#21666)
fix: capture txs not available error reason in proposal handler (#21670)
fix: estimate gas in bot and make BatchCall.simulate() return
SimulationResult (#21676)
fix: prevent HA peer proposals from blocking equivocation in duplicate
proposal test (#21673)
fix(p2p): penalize peers for errors during response reading (#21680)
feat(sequencer): add build-ahead config and metrics (#20779)
chore: fixing build on mac (#21685)
fix: HA deadlock for last block edge case (#21690)
fix: process all contract classes in storeBroadcastedIndividualFunctions
(A-683) (#21686)
chore: add slack success post on nightly scenario (#21701)
fix(builder): persist contractsDB across blocks within a checkpoint
(#21520)
fix: only delete logs from rolled-back blocks, not entire tag (A-686)
(#21687)
chore(p2p): lower attestation pool per-slot caps to 2 (#21709)
chore(p2p): remove unused method (#21678)
fix(p2p): penalize peer on tx rejected by pool (#21677)
fix(test): workaround slow mock creation (#21708)
fix(sequencer): fix checkpoint budget redistribution for multi-block
slots (#21692)
fix: batch checkpoint unwinding in handleEpochPrune (A-690) (#21668)
fix(sequencer): add missing opts arg to checkpoint_builder tests
(#21733)
fix: race condition in fast tx collection (#21496)
fix: increase default postgres disk size from 1Gi to 10Gi (#21741)
fix: update batch_tx_requester tests to use RequestTracker (#21734)
chore: replace dead BOOTSTRAP_TO env var with bootstrap.sh build arg
(#21744)
fix(sequencer): extract gas and blob configs from valid requests only
(A-677) (#21747)
fix: deflake attempt for l1_tx_utils (#21743)
fix(test): fix flaky keystore reload test (#21749)
fix(test): fix flaky duplicate_attestation_slash test (#21753)
feat(pipeline): introduce pipeline views for building (#21026)
END_COMMIT_OVERRIDE
AztecBot added a commit that referenced this pull request Mar 19, 2026
BEGIN_COMMIT_OVERRIDE
feat: entrypoint replay protection (#21649)
feat: guard BoundedVec oracle returns against dirty trailing storage
(#21589)
fix: add bounds when allocating arrays in deserialization (#21622)
feat: implement manual Packable for structs with sub-Field members
(#21576)
fix(aztec-node): throw on existing nullifier in
getLowNullifierMembershipWitness (#21472)
fix: use trait dispatch for array Packable::unpack in card_game_contract
(#21683)
fix(p2p): penalize peers for errors during response reading (#21680)
fix: update nullifier non-inclusion test expectations after early oracle
throw (backport #21600) (#21615)
fix(aztec-nr): fix OOB index with nonzero offset (#21613)
fix(builder): persist contractsDB across blocks within a checkpoint
(#21520)
fix(stdlib): accept null return_type for void Noir functions (#21647)
feat: gas estimations on send (#21646)
fix(validator): process block proposals from own validator keys in HA
setups (backport #21603) (#21659)
fix(p2p): penalize peer on tx rejected by pool (#21677)
fix(sequencer): fix checkpoint budget redistribution for multi-block
slots (#21692)
feat: sync cache invalidation oracle (backport #21459) (#21730)
feat!: make AES128 decrypt oracle return Option (backport #21696)
(#21735)
feat!: include init_hash in private initialization nullifier (backport
#21427) (#21736)
fix(sequencer): extract gas and blob configs from valid requests only
(A-677) (#21747)
chore: backport #21744 — replace dead BOOTSTRAP_TO env var with
bootstrap.sh build arg (#21748)
refactor: revert remove assert_bounded_vec_trimmed (#21758)
END_COMMIT_OVERRIDE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants