Repository navigation
test/images with tailor [3]: resolve base includes and track fragment dependencies - #898
Draft
bfjelds (bfjelds) wants to merge 1 commit into
Conversation
Resolve includes before base merging and hash the merged fragment dependency list once for incremental builds. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 6501a6e2-9ece-44f9-a91a-4d8e0c0e6d07
|
Azure Pipelines: 1 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run. |
bfjelds (bfjelds)
changed the title
This was referenced Oct 26, 2026
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
Base includes declared directly in image.yaml are rejected during typed deserialization before the new resolver runs.
1 open issue
What changed in this PR
Part 3 of the Tailor migration adds base-fragment include resolution and per-cell dependency tracking for incremental image builds.
Changes:
- Resolve
base:includes before fragment merging and report them in explain plans. - Merge fragment
extraDependenciesinto each cell’s cache inputs. - Add regression tests and document dependency-merging behavior.
| File | Description |
|---|---|
tools/tailor/docs/reference/image-yaml.md |
Documents fragment dependency merging and path resolution. |
tools/tailor/crates/tailor/src/run.rs |
Initializes dependencies for conversion cells. |
tools/tailor/crates/tailor-exec/src/executor.rs |
Updates test cells with the dependency field. |
tools/tailor/crates/tailor-exec/src/arg_builder.rs |
Updates argument-builder test fixtures. |
tools/tailor/crates/tailor-core/src/selector.rs |
Updates selector test fixtures. |
tools/tailor/crates/tailor-core/src/orchestrator.rs |
Propagates and hashes merged cell dependencies. |
tools/tailor/crates/tailor-core/src/domain.rs |
Adds the merged dependency list to cells. |
tools/tailor/crates/tailor-config/src/render.rs |
Resolves base includes, merges dependencies, and adds regression coverage. |
tools/tailor/crates/tailor-config/src/fragment.rs |
Accepts fragment-level extra dependencies. |
Review effort: Balanced
| if let Some(mut value) = fragment.doc.base.clone() { | ||
| // Mirror config:'s $include handling (resolved before merge, see render_cell above) so a | ||
| // base: fragment can splice a shared snippet too, instead of only config: being able to. | ||
| include::resolve_includes(&mut value, image_dir)?; |
This branch has not been deployed
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.
Resolve base includes, include fragment dependencies in cache decisions, and explain resolved base inputs.
Part 3 of the 16-PR Tailor migration stack. Depends on #897.
This split preserves the aggregate migration content; the original tooling, image-config, and final trees are unchanged.
Stack