[V2:09] Run Zola With Workspace Theme#23
Open
ritorhymes wants to merge 6 commits into
Open
Conversation
ritorhymes
changed the title
This was referenced May 5, 2026
ritorhymes
force-pushed
the
v2/09-local-zola-theme-runner
branch
3 times, most recently
from
77b48a8 to
bf32bca
Compare
ritorhymes
force-pushed
the
v2/09-local-zola-theme-runner
branch
from
bf32bca to
f915e5e
Compare
Add workspace-local `.build-eips.toml` loading and starter configuration. Introduce `config::ActiveRepo` to load the selected checkout’s `Build.toml`, validate explicit `-C` roots, and expose active repository context to later commands. Keep source materialization, initialization, and diagnostics in their owning later branches.
Add clean and dirty source materialization for the active repository and sibling content. Use `config::RepositoryUse` throughout the runtime path, preserve tracked working-tree materialization and `index_path`, and reject dirty active manifests in clean modes. Build, check, and serve prepare sources without fetching the active upstream; `changed` retains upstream fetching for comparison.
Add workspace initialization from the selected active `Build.toml`. Clone missing sibling repositories from declared locations and initialize a missing theme checkout from the manifest repository and pin. Preserve existing usable checkouts and fail without deleting unusable paths. Write `.build-eips.toml` only when absent and generate `WORKSPACE.md` for the initialized workspace.
Add `build-eips doctor` for validating workspace configuration, active `Build.toml`, managed sibling repositories, the local theme checkout, and required tools. Report ok/warn/fail diagnostics; invalid active manifests and unusable theme configuration fail, while expected sibling and theme-pin conditions can warn. Keep diagnostics read-only and leave execution and runtime behavior to later branches.
Resolve build, check, and serve source policy around local active sources, clean mode, remote siblings, build roots, and base URL precedence. Keep `--clean` and `--remote-siblings` as source controls and limit `--only` to supported local dirty modes. Route runtime commands through one resolved execution policy.
Run Zola with the editable `workspace/theme` checkout. Materialize tracked local theme files into prepared `themes/eips-theme`, load Zola and eipw configuration from that local checkout, and keep runtime commands independent of manifest network access.
ritorhymes
force-pushed
the
v2/09-local-zola-theme-runner
branch
from
f915e5e to
8a5807b
Compare
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
1 participant
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.
Summary
This PR replaces the remote theme fetch/cache path with the workspace-local
theme/checkout used by theme-dependent build, check, serve, and editorial workflows. The local theme is mounted into the prepared repository atthemes/eips-themebefore Zola runs, while Zola and eipw configuration resolve from that checkout.The active repository remains local by default.
--remote-siblingsmay change sibling-source selection, but it does not restore remote theme fetching: theme-dependent workflows still use the editable local workspace theme. Commands that do not require Zola or eipw theme configuration, includingchangedandclean, remain independent from theme resolution.directories/sha3dependencies.theme/checkout where Zola or eipw configuration is needed.repo/themes/eips-themebefore invoking Zola.changedandcleanindependent from theme resolution.Review Notes
This is the runtime theme switch. Before this PR, runtime code could fetch and cache a remote theme revision. After it, every theme-dependent workflow uses the workspace-local theme established by V2:06 and validated by V2:07.
The local theme is a development source. It remains editable regardless of whether an execution uses the default active local source,
--clean, or--remote-siblings.ResolvedExecutioncarries the local theme location for callers that require it. Build, check, serve, and editorial commands require a theme; commands that do not need Zola or eipw configuration do not.Remote theme support is intentionally removed.
--remote-siblingschanges only declared sibling-source selection; it does not change the theme source or permit a fetched theme.Zola receives the theme through a mounted path in the disposable prepared repository:
repo/themes/eips-theme. The Zola config path derives from that mounted theme so relative theme assumptions match normal Zola project layout. eipw readsconfig/eipw.tomldirectly from the local theme checkout.This PR does not add the prepared runtime pipeline itself. V2:10 moves build and check preparation into the dedicated pipeline module while retaining this local-theme model.
Verification
src/execution.rsfor local-theme resolution, missing-theme errors, and applicability to build, check, serve, and editorial commands.src/main.rsandsrc/lint.rsfor eipw configuration loading from the local theme rather than the removed cache.src/zola.rsfor local-theme mounting, mounted config-path construction, and Zola build/check/serve invocation.src/layout.rsfor output, mounted-theme, and theme-config path helpers.Cargo.toml,Cargo.lock,src/cache.rs, andsrc/git.rsfor removal of the remote theme-cache path.