Skip to content

merge queue: embarking main (e25b9c7) and #185 together#186

Closed
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/5521dfb37e
Closed

merge queue: embarking main (e25b9c7) and #185 together#186
mergify[bot] wants to merge 2 commits into
mainfrom
mergify/merge-queue/5521dfb37e

Conversation

@mergify

@mergify mergify Bot commented May 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch main (e25b9c7) and #185 are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of #185.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule default for merge:

  • all of:
    • #changes-requested-reviews-by=0
    • base=main
    • check-success=Build (amd64, archive2disk)
    • check-success=Build (amd64, cexec)
    • check-success=Build (amd64, grub2disk)
    • check-success=Build (amd64, image2disk)
    • check-success=Build (amd64, kexec)
    • check-success=Build (amd64, oci2disk)
    • check-success=Build (amd64, qemuimg2disk)
    • check-success=Build (amd64, rootio)
    • check-success=Build (amd64, slurp)
    • check-success=Build (amd64, syslinux)
    • check-success=Build (amd64, writefile)
    • check-success=DCO
    • label!=do-not-merge
    • any of:
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, writefile)
    • check-neutral = Build (amd64, writefile)
    • check-skipped = Build (amd64, writefile)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, archive2disk)
    • check-neutral = Build (amd64, archive2disk)
    • check-skipped = Build (amd64, archive2disk)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, cexec)
    • check-neutral = Build (amd64, cexec)
    • check-skipped = Build (amd64, cexec)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, grub2disk)
    • check-neutral = Build (amd64, grub2disk)
    • check-skipped = Build (amd64, grub2disk)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, image2disk)
    • check-neutral = Build (amd64, image2disk)
    • check-skipped = Build (amd64, image2disk)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, kexec)
    • check-neutral = Build (amd64, kexec)
    • check-skipped = Build (amd64, kexec)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, oci2disk)
    • check-neutral = Build (amd64, oci2disk)
    • check-skipped = Build (amd64, oci2disk)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, qemuimg2disk)
    • check-neutral = Build (amd64, qemuimg2disk)
    • check-skipped = Build (amd64, qemuimg2disk)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, rootio)
    • check-neutral = Build (amd64, rootio)
    • check-skipped = Build (amd64, rootio)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, slurp)
    • check-neutral = Build (amd64, slurp)
    • check-skipped = Build (amd64, slurp)
  • any of [🛡 GitHub branch protection]:
    • check-success = Build (amd64, syslinux)
    • check-neutral = Build (amd64, syslinux)
    • check-skipped = Build (amd64, syslinux)
  • any of [🛡 GitHub branch protection]:
    • check-success = DCO
    • check-neutral = DCO
    • check-skipped = DCO

Required conditions to stay in the queue:

---
checking_base_sha: e25b9c7324ce43e2c1a37f416c95e927b6bb7826
previous_failed_batches: []
pull_requests:
  - number: 185
    scopes: []
scopes: []
...

jacobweinstock and others added 2 commits May 29, 2026 10:18
@jacobweinstock
bump qemu to 11.0.1:
1fb7bbb 
Upgrading Alpine surfaced an issue with
the bundled qemu-img 6.1.0 crashing with SIGSEGV inside libcurl's
connection-pool teardown when built against libcurl >= 8.10, which is
what every currently-supported Alpine release ships. The crash happens
after the convert succeeds, so the destination disk is left in an
indeterminate state and the action reports failure on every run.

Newer qemu reworked block/curl.c to cope with libcurl's multi-event API
and is no longer affected. While here, also fix HTTPS sources (static
libcurl looks for /etc/ssl/cert.pem, which scratch images don't have)
and surface convert progress so long downloads aren't silent.

Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
@mergify
Merge of #185
eaf27a0
@mergify mergify Bot mentioned this pull request May 29, 2026
Merged
3 tasks
@mergify mergify Bot closed this May 29, 2026
@mergify mergify Bot deleted the mergify/merge-queue/5521dfb37e branch May 29, 2026 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jacobweinstock