Skip to content

Fix WASI buildbots to support the new default target #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 8, 2024
Merged

Fix WASI buildbots to support the new default target #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
42a82c3
Limit non-debug WASI builds to 3.11 and 3.12
brettcannon Sep 27, 2024
09bbce6
Make the buildbot config for WASI explicitly set the target triple
brettcannon Nov 7, 2024
b1edb72
Merge branch 'main' of https://github.com/python/buildmaster-config i…
brettcannon Nov 7, 2024
11cd06b
Go back to using defaults
brettcannon Nov 7, 2024
132e343
Brand everything as being for WASI preview1
brettcannon Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions master/custom/builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
WindowsARM64Build,
WindowsARM64ReleaseBuild,
Wasm32WasiCrossBuild,
Wasm32WasiDebugBuild,
Wasm32WasiPreview1DebugBuild,
IOSARM64SimulatorBuild,
AndroidBuild,
ValgrindBuild,
Expand Down Expand Up @@ -133,7 +133,7 @@

# WASI
("wasm32-wasi Non-Debug", "bcannon-wasi", Wasm32WasiCrossBuild),
("wasm32-wasi", "bcannon-wasi", Wasm32WasiDebugBuild),
("wasm32-wasi", "bcannon-wasi", Wasm32WasiPreview1DebugBuild),
]


Expand Down
7 changes: 4 additions & 3 deletions master/custom/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):
super().setup(parallel, branch, test_with_PTY=test_with_PTY, **kwargs)


class _Wasm32WasiBuild(UnixBuild):
class _Wasm32WasiPreview1Build(UnixBuild):
"""Build Python for wasm32-wasi using Tools/wasm/wasi.py."""
buildersuffix = ".wasi"
factory_tags = ["wasm", "wasi"]
Expand All @@ -886,7 +886,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"]
Expand Down Expand Up @@ -968,7 +969,7 @@ def setup(self, parallel, branch, test_with_PTY=False, **kwargs):

# Preventing this from running on versions older than 3.13 is managed in
# master.cfg.
class Wasm32WasiDebugBuild(_Wasm32WasiBuild):
class Wasm32WasiPreview1DebugBuild(_Wasm32WasiPreview1Build):
append_suffix = ".debug"
pydebug = True
testFlags = ["-u-cpu"]
Expand Down
Loading