Skip to content

merge queue: checking #77 on main (9ccacb2) - #78

Closed
mergify[bot] wants to merge 3 commits into
mainfrom
mergify/merge-queue/9edbd985ff
Closed

mergify[bot] wants to merge 3 commits into
mainfrom
mergify/merge-queue/9edbd985ff

Conversation

@mergify

@mergify mergify Bot commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

Note

This is a merge queue draft opened by Mergify. Nobody needs to act on it.
Mergify opened it for batch usual-fricassee-jlc44s of the default queue, to test #77 before it merges into main. Pushing to this branch or closing this pull request removes #77 from the queue.

What this draft tests

Mergify checks that #77 still passes CI on top of main. CI runs on this draft's code, built in this order:

  1. main at 9ccacb2
  2. #77, the pull request of this batch

🎉 Where it stands: checks passed

CI passed on this draft.

Follow the default queue in the dashboard

What happens next

  • Mergify merges #77 into main and closes this draft.
Metadata for CI tooling, read by mergify ci
---
all_scopes: false
checking_base_sha: 9ccacb2b4cf10c8fcde6d3f764363bc03ee647b3
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 77
    scopes: []
scopes: []
...
Required conditions of queue rule default for merge
  • #changes-requested-reviews-by=0
  • base=main
  • check-success=DCO
  • check-success=build-captainos (with kernel) trixie-slim (amd64)
  • check-success=build-captainos (with kernel) trixie-slim (arm64)
  • check-success=build-captainos trixie-armbian-rpi (arm64)
  • check-success=build-captainos trixie-full (amd64)
  • check-success=build-captainos trixie-full (arm64)
  • check-success=build-captainos trixie-genio (arm64)
  • check-success=build-captainos trixie-meson64 (arm64)
  • check-success=build-captainos trixie-rockchip64 (arm64)
  • check-success=build-captainos trixie-rockchip64-vendor (arm64)
  • check-success=build-captainos-kernel (amd64)
  • check-success=build-captainos-kernel (arm64)
  • check-success=build-dockerfile (amd64)
  • check-success=build-dockerfile (arm64)
  • check-success=download-tools (amd64)
  • check-success=download-tools (arm64)
  • check-success=prepare
  • github-review-approved [🛡 GitHub repository ruleset rule main]
  • label!=do-not-merge
  • label=ready-to-merge
  • queue-position>=0
  • any of:
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/download-tools (amd64)
    • check-neutral = @github-actions/download-tools (amd64)
    • check-skipped = @github-actions/download-tools (amd64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/download-tools (arm64)
    • check-neutral = @github-actions/download-tools (arm64)
    • check-skipped = @github-actions/download-tools (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos (with kernel) trixie-slim (amd64)
    • check-neutral = @github-actions/build-captainos (with kernel) trixie-slim (amd64)
    • check-skipped = @github-actions/build-captainos (with kernel) trixie-slim (amd64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos (with kernel) trixie-slim (arm64)
    • check-neutral = @github-actions/build-captainos (with kernel) trixie-slim (arm64)
    • check-skipped = @github-actions/build-captainos (with kernel) trixie-slim (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-armbian-rpi (arm64)
    • check-neutral = @github-actions/build-captainos trixie-armbian-rpi (arm64)
    • check-skipped = @github-actions/build-captainos trixie-armbian-rpi (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-full (amd64)
    • check-neutral = @github-actions/build-captainos trixie-full (amd64)
    • check-skipped = @github-actions/build-captainos trixie-full (amd64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-full (arm64)
    • check-neutral = @github-actions/build-captainos trixie-full (arm64)
    • check-skipped = @github-actions/build-captainos trixie-full (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-genio (arm64)
    • check-neutral = @github-actions/build-captainos trixie-genio (arm64)
    • check-skipped = @github-actions/build-captainos trixie-genio (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-meson64 (arm64)
    • check-neutral = @github-actions/build-captainos trixie-meson64 (arm64)
    • check-skipped = @github-actions/build-captainos trixie-meson64 (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-rockchip64 (arm64)
    • check-neutral = @github-actions/build-captainos trixie-rockchip64 (arm64)
    • check-skipped = @github-actions/build-captainos trixie-rockchip64 (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos trixie-rockchip64-vendor (arm64)
    • check-neutral = @github-actions/build-captainos trixie-rockchip64-vendor (arm64)
    • check-skipped = @github-actions/build-captainos trixie-rockchip64-vendor (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos-kernel (amd64)
    • check-neutral = @github-actions/build-captainos-kernel (amd64)
    • check-skipped = @github-actions/build-captainos-kernel (amd64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/prepare
    • check-neutral = @github-actions/prepare
    • check-skipped = @github-actions/prepare
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-dockerfile (amd64)
    • check-neutral = @github-actions/build-dockerfile (amd64)
    • check-skipped = @github-actions/build-dockerfile (amd64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-dockerfile (arm64)
    • check-neutral = @github-actions/build-dockerfile (arm64)
    • check-skipped = @github-actions/build-dockerfile (arm64)
  • any of [🛡 GitHub repository ruleset rule main]:
    • check-success = @github-actions/build-captainos-kernel (arm64)
    • check-neutral = @github-actions/build-captainos-kernel (arm64)
    • check-skipped = @github-actions/build-captainos-kernel (arm64)
Required conditions to stay in the queue

jacobweinstock and others added 3 commits October 14, 2026 19:00
Tinkerbell needed a layout file published with every ISO to find the
slot. Fetching, caching and keeping that file in step with the ISO,
across redirects and ISOs replaced in place, was where most of
Tinkerbell's complexity and failure modes came from.

Every sector of the slot now starts with a header identifying it, so
Tinkerbell finds the slot in the bytes it serves, as it already does
the kernel arguments, and no layout file is published. Each header is
an empty cpio archive, so an ISO served unmodified still boots.

The build checks that the slot is stored intact and sector aligned,
and that nothing else in the ISO looks like one of its headers. An
ISO that fails the check is removed, and an existing ISO is only
reused when it passes.

Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
grub-mkrescue wrote straight to the final path, so a build that failed
or was interrupted after writing the bootstrap slot left a truncated ISO
whose slot still passes the check, and a later build reused it. Build
and check the ISO under a .partial name and move it into place only when
both succeed.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
@mergify mergify Bot closed this Oct 15, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/9edbd985ff branch October 15, 2026 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant