Skip to content

Commit 96780ff

Browse files
committed
Improvements to the Emscripten buildbot
* Use the build script from its new `Platform/emscripten/__main__.py` location * Use `python3 Platform/emscripten run` to avoid hard coding build output path * Use new `EMSDK_CACHE` environment variable to allow build script to manage Emscripten installations * Allow build script to manage node installations python/cpython#146156 has to land first
1 parent de388c9 commit 96780ff

1 file changed

Lines changed: 12 additions & 18 deletions

File tree

master/custom/factories.py

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,48 +1357,42 @@ class EmscriptenBuild(BaseBuild):
13571357

13581358
def setup(self, **kwargs):
13591359
compile_environ = {
1360-
"PATH": os.pathsep.join([
1361-
"/home/emscripten/emsdk",
1362-
"/home/emscripten/emsdk/upstream/emscripten",
1363-
"/home/emscripten/.local/bin",
1364-
"/usr/local/bin",
1365-
"/usr/bin",
1366-
"/bin",
1367-
]),
1368-
"EMSDK": "/home/emscripten/emsdk",
1369-
"PYTHON_NODE_VERSION": "24",
1360+
"EMSDK_CACHE": "/home/emscripten/emsdk-versions",
13701361
}
13711362

13721363
self.addSteps([
13731364
Configure(
13741365
name="Configure build Python",
1375-
command=["python3", "Tools/wasm/emscripten", "configure-build-python"],
1366+
command=["python3", "Platform/emscripten", "configure-build-python"],
13761367
env=compile_environ,
13771368
),
13781369
Compile(
13791370
name="Compile build Python",
1380-
command=["python3", "Tools/wasm/emscripten", "make-build-python"],
1371+
command=["python3", "Platform/emscripten", "make-build-python"],
13811372
env=compile_environ,
13821373
),
13831374
Compile(
13841375
name="Compile host libFFI",
1385-
command=["python3", "Tools/wasm/emscripten", "make-libffi"],
1376+
command=["python3", "Platform/emscripten", "make-libffi"],
13861377
env=compile_environ,
13871378
),
13881379
Configure(
13891380
name="Configure host Python",
1390-
command=["python3", "Tools/wasm/emscripten", "configure-host"],
1381+
command=["python3", "Platform/emscripten", "configure-host"],
13911382
env=compile_environ,
13921383
),
13931384
Compile(
13941385
name="Compile host Python",
1395-
command=["python3", "Tools/wasm/emscripten", "make-host"],
1386+
command=["python3", "Platform/emscripten", "make-host"],
13961387
env=compile_environ,
13971388
),
13981389
Test(
13991390
name="Node full test suite",
14001391
command=[
1401-
"cross-build/wasm32-emscripten/build/python/python.sh",
1392+
"python3",
1393+
"Platform/emscripten",
1394+
"run",
1395+
"--",
14021396
"-m", "test",
14031397
"-v",
14041398
"-uall",
@@ -1412,14 +1406,14 @@ def setup(self, **kwargs):
14121406
Test(
14131407
name="PyRepl in Chrome smoke test",
14141408
command=[
1415-
"Tools/wasm/emscripten/browser_test/run_test.sh",
1409+
"Platform/emscripten/browser_test/run_test.sh",
14161410
],
14171411
env=compile_environ,
14181412
timeout=step_timeout(self.test_timeout),
14191413
),
14201414
Clean(
14211415
name="Clean the builds",
1422-
command=["python3", "Tools/wasm/emscripten", "clean"],
1416+
command=["python3", "Platform/emscripten", "clean"],
14231417
env=compile_environ,
14241418
)
14251419
])

0 commit comments

Comments
 (0)