From 42a82c33ef0eb896a54d8bad01767eb7c14f7c9b Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 26 Sep 2024 17:05:34 -0700 Subject: [PATCH 1/2] Limit non-debug WASI builds to 3.11 and 3.12 It's when WASI was tier 3 and the files in `Tools/wasm` used for the build are removed in 3.14. --- master/master.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/master/master.cfg b/master/master.cfg index 8adefdf37..6c019bbe2 100644 --- a/master/master.cfg +++ b/master/master.cfg @@ -239,9 +239,13 @@ for branch_num, (git_url, branchname, git_branch) in enumerate(git_branches): # Only 3.11+ for WebAssembly builds if "wasm" in tags: + # WASM wasn't a supported platform until 3.11. if branchname in {"3.9", "3.10"}: continue - # Pydebug support is 3.13+ + # Tier 3 support is 3.11 & 3.12. + elif "nondebug" in tags and branchname not in {"3.11", "3.12"}: + continue + # Tier 2 support is 3.13+. elif "nondebug" not in tags and branchname in {"3.11", "3.12"}: continue From 09bbce64fdb5b879fc1afa70a08714f60a0191eb Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 7 Nov 2024 14:22:27 -0800 Subject: [PATCH 2/2] Make the buildbot config for WASI explicitly set the target triple --- master/custom/factories.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index 991a6172e..d8ecadf13 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -873,7 +873,8 @@ def __init__(self, source, *, extra_tags=[], **kwargs): def setup(self, parallel, branch, test_with_PTY=False, **kwargs): wasi_py = "Tools/wasm/wasi.py" - host_path = "build/cross-build/wasm32-wasi" + host_triple = "wasm32-wasip1" + host_path = f"build/cross-build/{host_triple}" # Build Python build_configure = ["python3", wasi_py, "configure-build-python"] @@ -897,13 +898,13 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs): # Pydebug build automatically inferred from build Python. Configure( name="Configure host Python", - command=["python3", wasi_py, "configure-host"], + command=["python3", wasi_py, "configure-host", "--target-triple", host_triple], ) ) self.addStep( Compile( name="Compile host Python", - command=["python3", wasi_py, "make-host"], + command=["python3", wasi_py, "make-host", "--target-triple", host_triple], ) )