Skip to content

fix(docs): repair merge queue docs checks#24087

Merged
alexghr merged 1 commit into
merge-train/spartanfrom
cb/spartan-orphan-baseline
Jun 15, 2026
Merged

fix(docs): repair merge queue docs checks#24087
alexghr merged 1 commit into
merge-train/spartanfrom
cb/spartan-orphan-baseline

Conversation

@AztecBot

@AztecBot AztecBot commented Jun 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

Investigated the latest merge-train/spartan dequeue for PR #23971. The PR is still mergeable against next; the latest removal from the merge queue happened at 2026-06-15T10:50:03Z after the synthetic merge-group SHA f202a73a3147bc7a5342b73ea4298f95040e762b failed CI.

The failing docs subjob ended with:

ERROR: cannot resolve base branch origin/next to source the orphan-check baseline.

That happens because merge-group checkouts may not have origin/next locally. The same subjob also showed real Vite resolution failures for local linked tutorial packages, but the docs examples wrapper masked them by disabling errexit while capturing step output.

Changes

  • Fetch the orphan URL baseline branch explicitly into refs/remotes/origin/<base> when it is missing, and honor MERGE_GROUP_BASE_REF for merge-group events.
  • Add @aztec/protocol-contracts to the webapp tutorial dependency list.
  • Make webapp tutorial CI linking add the local @aztec/* dependency closure for workspace:, portal:, and file: deps, so local link: installs behave like published npm package installs for transitive workspace packages such as @aztec/blob-lib and @aztec/bb.js.
  • Copy normal npm dependencies from linked local package manifests into the temporary tutorial install, covering external transitive deps such as lodash.times.
  • Keep errexit enabled inside docs example step capture so failing commands such as npx vite build are reported instead of followed by a success line.

Verification

  • bash -n docs/bootstrap.sh docs/examples/bootstrap.sh
  • CI=1 GITHUB_EVENT_NAME=merge_group MERGE_GROUP_BASE_REF=refs/heads/next docs/bootstrap.sh check_orphaned_urls
  • Bounded webapp tutorial Yarn link/install check with corepack yarn@4.13.0 install --mode=skip-build, confirming @aztec/protocol-contracts, @aztec/blob-lib, @aztec/bb.js, and lodash.times resolve from the tutorial install.

Note: I also ran the exact requested ./bootstrap.sh ci; on this branch it exits immediately with Unknown command: ci, so there is no generic root ci entrypoint to run locally here.

@AztecBot AztecBot added ci-draft Run CI on draft PRs. ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure claudebox Owned by claudebox. it can push to this PR. labels Jun 15, 2026
@AztecBot AztecBot force-pushed the cb/spartan-orphan-baseline branch from c36515a to 0ecfe9a Compare June 15, 2026 11:18
@AztecBot AztecBot force-pushed the cb/spartan-orphan-baseline branch from 0ecfe9a to e702f35 Compare June 15, 2026 11:26
@alexghr alexghr marked this pull request as ready for review June 15, 2026 12:08
@alexghr alexghr requested a review from a team as a code owner June 15, 2026 12:08
@alexghr alexghr enabled auto-merge (squash) June 15, 2026 12:08
@alexghr alexghr merged commit 668aad9 into merge-train/spartan Jun 15, 2026
21 checks passed
@alexghr alexghr deleted the cb/spartan-orphan-baseline branch June 15, 2026 12:09
danielntmd pushed a commit to danielntmd/aztec-packages that referenced this pull request Jun 16, 2026
BEGIN_COMMIT_OVERRIDE
chore(ci): notify slack on benchmark success (AztecProtocol#23964)
fix: interrupt publisher send-at-slot sleep on sequencer stop (AztecProtocol#23990)
chore: aztec-node render external secrets (AztecProtocol#23997)
chore: expose ROLLUP_VERSION (AztecProtocol#23998)
chore: enable workload identity (AztecProtocol#23999)
feat: kong ingress (AztecProtocol#24000)
feat: add version RPC deployments (AztecProtocol#24001)
feat: add readiness gate (AztecProtocol#24002)
chore: update IAM roles (AztecProtocol#24011)
chore: conflicts (AztecProtocol#24019)
chore: resolve merge conficts (AztecProtocol#24044)
chore(ci): align nightly scheduled workflow times (AztecProtocol#24045)
chore: merge next into merge-train/spartan (resolve conflicts) (AztecProtocol#24052)
fix(docs): repair webapp tutorial build on spartan train (AztecProtocol#24057)
fix: repair webapp tutorial on spartan train (AztecProtocol#24084)
fix(docs): repair merge queue docs checks (AztecProtocol#24087)
END_COMMIT_OVERRIDE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-draft Run CI on draft PRs. ci-no-fail-fast Sets NO_FAIL_FAST in the CI so the run is not aborted on the first failure claudebox Owned by claudebox. it can push to this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants