Hongru/cibuildwheel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: pass platform args to linux32 deadlock sanity check (#2888)

Browse Source 
The linux32 sanity check added in #2880 omitted `*platform_args`, unlike
the surrounding `uname -m` probes and the `create` command. On the i386
fallback path `platform_args` is reassigned to AMD64, so without
forwarding it the check could run against a different image variant than
the one actually built (e.g. on a multi-platform/containerd backend),
making the check meaningless or pulling the wrong variant.

Assisted-by: ClaudeCode:claude-opus-4.8
This commit is contained in:
Henry Schreiner
2026-06-02 06:42:44 +02:00
committed by GitHub
parent 72b75a45a2
commit f01c1955a9
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cibuildwheel/oci_container.py
+8 -1
View File
@@ -301,7 +301,14 @@ class OCIContainer:
if container_machine not in {"i686", "armv7l", "armv8l"}: if container_machine not in {"i686", "armv7l", "armv8l"}:
simulate_32_bit = True simulate_32_bit = True
# sanity check to ensure no deadlock waiting for container to start # sanity check to ensure no deadlock waiting for container to start
call(*run_cmd, self.image, "linux32", "/bin/true", capture_stdout=True) call(
*run_cmd,
*platform_args,
self.image,
"linux32",
"/bin/true",
capture_stdout=True,
)
shell_args = ["linux32", "/bin/bash"] if simulate_32_bit else ["/bin/bash"] shell_args = ["linux32", "/bin/bash"] if simulate_32_bit else ["/bin/bash"]