Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions tools/build_web.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ def publish_libraries(output, release=None):
path = f"libraries/{platform}-{checksum}.zip"
temporary.replace(output / path)
manifest["platforms"][platform] = {"path": path, "size": size, "expandedBytes": expanded, "sha256": checksum}
except zipfile.BadZipFile as error:
raise ValueError(f"Invalid release archive {asset['name']}: {error}") from error
finally:
temporary.unlink(missing_ok=True)
(output / "release.json").write_text(json.dumps(manifest, indent=2) + "\n", encoding="utf-8")
Expand Down Expand Up @@ -158,6 +160,8 @@ def publish_release(output):
raise RuntimeError(f"Could not restore release output. Previous site is preserved at {previous}") from error
raise
published = True
except zipfile.BadZipFile as error:
raise ValueError(f"Invalid release archive {asset['name']}: {error}") from error
finally:
if published or not previous.exists():
shutil.rmtree(temporary)
Expand Down
21 changes: 21 additions & 0 deletions tools/tests/test_web_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,27 @@ def test_release_mode_does_not_require_a_local_wasm_build(self):
build_web.main()
self.assertEqual((self.output / "native/relinker_wasm.mjs").read_bytes(), self.contents["native/relinker_wasm.mjs"])

def test_invalid_zip_reports_cli_error_and_preserves_previous_site(self):
self.seed_previous()
previous = self.snapshot()
for name in ("web-v1.zip", "prx-windows-v1.zip", "prx-linux-v1.zip"):
with self.subTest(asset=name):
self.requests.clear()
original = self.responses[f"https://example.test/{name}"]
self.set_asset(name, original[:-22])
errors = io.StringIO()
try:
with patch.object(build_web, "request", self.request), contextlib.redirect_stderr(errors):
with self.assertRaises(SystemExit) as error:
build_web.main(["--build", str(self.build), "--release"])
self.assertEqual(error.exception.code, 2)
self.assertIn(f"error: Invalid release archive {name}: File is not a zip file", errors.getvalue())
self.assertNotIn("Traceback", errors.getvalue())
self.assertEqual(self.snapshot(), previous)
self.assertEqual(list(self.build.glob(".web-release-*")), [])
finally:
self.set_asset(name, original)

def test_local_build_still_copies_sources_without_network(self):
source = self.root / "source/demo/web"
source.mkdir(parents=True)
Expand Down
Loading