WIP: fix: compose native build fixture prerequisites #482

Draft
erikinkinen wants to merge 5 commits from feature/native-build-fixture-prerequisites into feature/native-object-fixture-toolchain
Owner

Combine the explicit nightly object-fixture tools from #480 with the detached shell-import fix from #481. Native build branches can consume both corrections from one prerequisite.

The defining code of both fixes is unchanged. This PR stacks on #480 and adds the shell fixture correction.

  • Preserve both fixes in a normal merge.
  • Complete CI on the combined revision.
Combine the explicit nightly object-fixture tools from [#480](https://git.erikinkinen.fi/erix/integration/pulls/480) with the detached shell-import fix from [#481](https://git.erikinkinen.fi/erix/integration/pulls/481). Native build branches can consume both corrections from one prerequisite. The defining code of both fixes is unchanged. This PR stacks on #480 and adds the shell fixture correction. - [x] Preserve both fixes in a normal merge. - [ ] Complete CI on the combined revision.
erikinkinen added this to the Alpha 1 milestone 2026-11-06 23:52:30 +01:00
fix: Include shell imports in the component layout fixture
Some checks failed
CI / host_zero (push) Successful in 13m22s
CI / host_three (push) Failing after 14m31s
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 / markdown (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
CI / host_two (push) Successful in 14m49s
CI / markdown (push) Successful in 6s
CI / host_one (push) Failing after 22m10s
Coreutils provider graph / coreutils (push) Successful in 2m10s
CI / integration (push) Has been skipped
CI / rust (push) Successful in 3m17s
091173493e
The detached layout fixture omitted two direct imports of the actual image helper and failed before its source-layout assertions. Copy the complete shell import cohort and remove the duplicate helper copy.
fix: Compose native build fixture prerequisites
Some checks failed
CI / host_zero (push) Successful in 14m24s
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 / markdown (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
CI / host_two (push) Successful in 15m50s
CI / markdown (push) Successful in 5s
CI / host_three (push) Successful in 14m13s
CI / host_one (push) Failing after 23m16s
CI / integration (push) Has been skipped
Coreutils provider graph / coreutils (push) Successful in 3m5s
CI / rust (push) Successful in 5m30s
529a00526f
Keep the explicit object compiler selection and complete detached shell imports together beneath native artifact builds. Preserve both defining fixes without changing source or native admission.
ci: Use shared development dependency profiles
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 / markdown (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
Coreutils provider graph / coreutils (pull_request) Has been skipped
CI / rust (push) Has been cancelled
CI / host_zero (push) Has been cancelled
CI / host_one (push) Has been cancelled
CI / host_two (push) Has been cancelled
CI / host_three (push) Has been cancelled
CI / integration (push) Has been cancelled
CI / markdown (push) Has been cancelled
Coreutils provider graph / coreutils (push) Has been cancelled
431c7e46e0
Keep authored manifests on main and select coordinated providers through Integration. Resolve branches once per run, retain the frozen snapshot and helper identity as artifacts, and use shared source checks instead of copied tests and guides.
ci: Separate Markdown checks from the build workflow
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
CI / rust (push) Has been cancelled
CI / host_zero (push) Has been cancelled
CI / host_one (push) Has been cancelled
CI / host_two (push) Has been cancelled
CI / host_three (push) Has been cancelled
CI / integration (push) Has been cancelled
Coreutils provider graph / coreutils (push) Has been cancelled
Markdown / markdown (push) Has been cancelled
f3b19dfe88
Keep each workflow below the repository size limit by giving Markdown its own file. Preserve event filters, job conditions and command bodies, with independent concurrency for the Markdown workflow.
ci: Use shared development dependency profiles
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) Successful in 11s
Coreutils provider graph / coreutils (push) Successful in 4m26s
CI / rust (push) Successful in 7m11s
CI / host_zero (push) Successful in 15m1s
CI / host_two (push) Successful in 16m33s
CI / host_three (push) Failing after 15m55s
CI / host_one (push) Failing after 23m27s
CI / integration (push) Has been skipped
1373a36870
Keep authored manifests on main and select coordinated providers through Integration. Resolve branches once per run, retain the frozen snapshot and helper identity as artifacts, and use shared source checks instead of copied tests and guides.
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) Successful in 11s
Coreutils provider graph / coreutils (push) Successful in 4m26s
CI / rust (push) Successful in 7m11s
CI / host_zero (push) Successful in 15m1s
CI / host_two (push) Successful in 16m33s
CI / host_three (push) Failing after 15m55s
CI / host_one (push) Failing after 23m27s
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/native-build-fixture-prerequisites:feature/native-build-fixture-prerequisites'
git switch 'feature/native-build-fixture-prerequisites'

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/native-object-fixture-toolchain'
git merge --no-ff 'feature/native-build-fixture-prerequisites'
git switch 'feature/native-build-fixture-prerequisites'
git rebase 'feature/native-object-fixture-toolchain'
git switch 'feature/native-object-fixture-toolchain'
git merge --ff-only 'feature/native-build-fixture-prerequisites'
git switch 'feature/native-build-fixture-prerequisites'
git rebase 'feature/native-object-fixture-toolchain'
git switch 'feature/native-object-fixture-toolchain'
git merge --no-ff 'feature/native-build-fixture-prerequisites'
git switch 'feature/native-object-fixture-toolchain'
git merge --squash 'feature/native-build-fixture-prerequisites'
git switch 'feature/native-object-fixture-toolchain'
git merge --ff-only 'feature/native-build-fixture-prerequisites'
git switch 'feature/native-object-fixture-toolchain'
git merge 'feature/native-build-fixture-prerequisites'
git push origin 'feature/native-object-fixture-toolchain'
Sign in to join this conversation.
No description provided.