WIP: Preserve retained fixture source paths #563

Draft
erikinkinen wants to merge 1 commit from feature/retained-fixture-source-paths into feature/retained-fixture-metadata
Owner

Retained fixture discovery now preserves the complete directory selected by its catalog, including acquisition prefixes. Previously the shared resolver discarded that prefix and failed private realm staging before compilation. Legacy discovery keeps its existing basename behavior.

Depends on #562. Actual resolver checks cover the acquired layout, legacy lookup and refusal outside the selected root; independent syntax and AST checks pass.

  • Preserve selected retained source paths.
  • Pass resolver and syntax controls.
  • Complete the fresh directory-stream and SHA2 image/guest cases.
Retained fixture discovery now preserves the complete directory selected by its catalog, including acquisition prefixes. Previously the shared resolver discarded that prefix and failed private realm staging before compilation. Legacy discovery keeps its existing basename behavior. Depends on [#562](https://git.erikinkinen.fi/erix/integration/pulls/562). Actual resolver checks cover the acquired layout, legacy lookup and refusal outside the selected root; independent syntax and AST checks pass. - [x] Preserve selected retained source paths. - [x] Pass resolver and syntax controls. - [ ] Complete the fresh directory-stream and SHA2 image/guest cases.
erikinkinen added this to the Alpha 1 milestone 2026-11-08 01:51:23 +01:00
fix: Preserve selected retained component source paths
Some checks failed
CI / rust (pull_request) Has been skipped
CI / host_zero (pull_request) Has been skipped
CI / host_one (pull_request) Has been skipped
CI / host_two (pull_request) Has been skipped
CI / host_three (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
Markdown / markdown (pull_request) Has been skipped
Markdown / markdown (push) Failing after 15s
CI / rust (push) Failing after 2m13s
Coreutils provider graph / coreutils (push) Successful in 4m8s
CI / host_zero (push) Has been skipped
CI / host_one (push) Has been skipped
CI / host_two (push) Has been skipped
CI / host_three (push) Has been skipped
CI / integration (push) Has been skipped
b83c52be19
Keep catalog acquisition directories intact when selecting retained fixture inputs. Preserve existing basename discovery for legacy component workspaces.
Author
Owner

Prepared the feature at c01cc992 on #562’s prepared history. It keeps each retained component on its selected acquisition path, with catalog traversal refusals tested. Unrelated inherited changes are omitted.

The original branch remains intact. This candidate needs fresh CI and review, with its prepared prerequisite reconciled before merging.

Prepared the feature at [c01cc992](https://git.erikinkinen.fi/erix/integration/commit/c01cc992731733a9ff9e4fe53ad372bdd12848d1) on #562’s prepared history. It keeps each retained component on its selected acquisition path, with catalog traversal refusals tested. Unrelated inherited changes are omitted. The original branch remains intact. This candidate needs fresh CI and review, with its prepared prerequisite reconciled before merging.
Author
Owner

Prepared c823d028ec369230ff4b9dc03a390d77a03b8b3f on feature/retained-fixture-source-paths-merge-ready-c823d028 now includes the canonical helper, fixture and Rust archive fixes from #564. The feature remains separate, and the original source and previous prepared ref are preserved. Review should use this new commit.

Prepared `c823d028ec369230ff4b9dc03a390d77a03b8b3f` on `feature/retained-fixture-source-paths-merge-ready-c823d028` now includes the canonical helper, fixture and Rust archive fixes from #564. The feature remains separate, and the original source and previous prepared ref are preserved. Review should use this new commit.
Some checks failed
CI / rust (pull_request) Has been skipped
CI / host_zero (pull_request) Has been skipped
CI / host_one (pull_request) Has been skipped
CI / host_two (pull_request) Has been skipped
CI / host_three (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
Markdown / markdown (pull_request) Has been skipped
Markdown / markdown (push) Failing after 15s
CI / rust (push) Failing after 2m13s
Coreutils provider graph / coreutils (push) Successful in 4m8s
CI / host_zero (push) Has been skipped
CI / host_one (push) Has been skipped
CI / host_two (push) Has been skipped
CI / host_three (push) Has been skipped
CI / integration (push) Has been skipped
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'feature/retained-fixture-source-paths:feature/retained-fixture-source-paths'
git switch 'feature/retained-fixture-source-paths'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'feature/retained-fixture-metadata'
git merge --no-ff 'feature/retained-fixture-source-paths'
git switch 'feature/retained-fixture-source-paths'
git rebase 'feature/retained-fixture-metadata'
git switch 'feature/retained-fixture-metadata'
git merge --ff-only 'feature/retained-fixture-source-paths'
git switch 'feature/retained-fixture-source-paths'
git rebase 'feature/retained-fixture-metadata'
git switch 'feature/retained-fixture-metadata'
git merge --no-ff 'feature/retained-fixture-source-paths'
git switch 'feature/retained-fixture-metadata'
git merge --squash 'feature/retained-fixture-source-paths'
git switch 'feature/retained-fixture-metadata'
git merge --ff-only 'feature/retained-fixture-source-paths'
git switch 'feature/retained-fixture-metadata'
git merge 'feature/retained-fixture-source-paths'
git push origin 'feature/retained-fixture-metadata'
Sign in to join this conversation.
No description provided.