2efa4ff94f
Dependency acquisition during packaging left native wheels and packager inputs outside the pre-build cache save. Compose PM and existing providers into a preparation phase, then require builds to consume admitted inputs. Share native preparation with PM Bundle. Keep path-bound environments and signing outputs separate from reusable caches. Use read-only cache tokens for commit builds and preserve the one-command local build path. Verify pinned tools through PM, probe PTYs under the prepared Electron, and supply dmgbuild through a build-only PM package. Resolve bundled tool stores from their payload manifest so relocation preserves discovery. Validation: focused Python and JS tests, checkJs, Ruff, Windows checks, anti-slop, cache relocation, and network-denied Linux AppImage builds. Relocated runtime smoke passed with NixOS host libraries supplied. Native Windows/macOS signing and live GitHub cache behavior remain untested.
100 lines
4.8 KiB
Python
100 lines
4.8 KiB
Python
"""PM Bundle shares preparation, not the desktop product dependency closure."""
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
import os
|
|
from pathlib import Path
|
|
import shutil
|
|
import subprocess
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
ROOT = Path(__file__).resolve().parents[2]
|
|
SCRIPT = ROOT / "scripts/bundles/native_build.py"
|
|
|
|
|
|
def test_payload_transport_does_not_require_or_export_desktop_inputs(tmp_path):
|
|
from scripts.ci.desktop_build_cache import describe_cache
|
|
|
|
source = tmp_path / "source"
|
|
source.mkdir()
|
|
cache = tmp_path / "cache"
|
|
description = describe_cache(source, cache, "payload-test")
|
|
assert set(description["paths"]) == {str(cache / name) for name in ("tools", "python/runtime", "native")}
|
|
assert "payload-test" in description["key"]
|
|
assert not cache.exists()
|
|
|
|
|
|
def test_native_worker_passes_shared_toolchain_to_native_owner(tmp_path, monkeypatch):
|
|
from scripts.bundles import native_build
|
|
from scripts.bundles import desktop_toolchain, native
|
|
|
|
request = {name: str(tmp_path / name) for name in ("source", "work", "cache", "out")}
|
|
request["ref"] = "a" * 40
|
|
selected = {"UV_CACHE_DIR": str(tmp_path / "native-wheel-identity"), "CC": "prepared-compiler"}
|
|
monkeypatch.setattr("scripts.bundles.desktop_prepare.require_source", lambda *args: None)
|
|
prepared_tools = []
|
|
def tools(source, work, cache, inherited):
|
|
prepared_tools.append((source, work, cache))
|
|
return Path("python"), Path("node"), selected
|
|
monkeypatch.setattr(desktop_toolchain, "prepare_tools", tools)
|
|
calls = []
|
|
def prepare_native(**kwargs):
|
|
calls.append(kwargs)
|
|
return tmp_path / "out.prepared.json"
|
|
monkeypatch.setattr(native, "prepare_native", prepare_native)
|
|
assert native_build.prepare_in_worker(request) == tmp_path / "out.prepared.json"
|
|
assert prepared_tools == [(tmp_path / "source", tmp_path / "work", tmp_path / "cache")]
|
|
assert calls == [{"source": tmp_path / "source", "out": tmp_path / "out", "ref": request["ref"],
|
|
"cache": Path(selected["UV_CACHE_DIR"]), "tools": tmp_path / "cache/tools", "env": selected}]
|
|
|
|
|
|
@pytest.mark.platforms("posix")
|
|
def test_native_cli_consumes_real_minimal_preparation_without_bootstrap(tmp_path):
|
|
from scripts.build.inputs import AgentInputs, RESOURCE_ENV
|
|
from scripts.bundles.native_prepared import publish_prepared
|
|
from pm.store import current_target
|
|
|
|
out = tmp_path / "payload"
|
|
code = out / "hermes-agent"
|
|
code.mkdir(parents=True)
|
|
(code / "pyproject.toml").write_text('[project]\nname="native-fixture"\nversion="1.0"\n[project.scripts]\nprobe="entry:main"\n')
|
|
(code / "entry.py").write_text('def main():\n print("native fixture")\n return 0\n')
|
|
for name in RESOURCE_ENV:
|
|
(code / name).mkdir()
|
|
python = out / "tools/python/bin/python3"
|
|
python.parent.mkdir(parents=True)
|
|
shutil.copy2(Path(getattr(sys, "_base_executable")).resolve(), python)
|
|
site = out / "venv/lib/site-packages"
|
|
site.mkdir(parents=True)
|
|
runtime = out / "pm-runtime"
|
|
(runtime / "lib/site-packages").mkdir(parents=True)
|
|
(runtime / "pm-runtime.json").write_text(json.dumps({"python": "../tools/python/bin/python3", "sitePackages": "lib/site-packages"}))
|
|
features = out / "enabled-features.json"
|
|
features.write_text('{"extras":[]}')
|
|
(out / "uv-cache").mkdir()
|
|
prepared = publish_prepared(out, ROOT, "a" * 40, AgentInputs(
|
|
project=code / "pyproject.toml", code=code, repo="hermes-agent", placement="contained",
|
|
target=current_target(), python=python, site_packages=site, environment=out / "venv",
|
|
tools=out / "tools", pm_runtime=runtime, features=features, ref="fixture",
|
|
resources={name: code / name for name in RESOURCE_ENV},
|
|
))
|
|
env = {**os.environ, "UV_OFFLINE": "1", "HERMES_HOME": str(tmp_path / "private")}
|
|
command = [sys.executable, "-S", "-B", str(SCRIPT), "--prepared", str(prepared)]
|
|
result = subprocess.run(command, cwd=tmp_path, env=env, capture_output=True, text=True, timeout=30)
|
|
assert result.returncode == 0, result.stderr
|
|
manifest = json.loads((out / "manifest.json").read_text())
|
|
assert manifest["runtime"]["commands"] == {"probe": "bin/probe"}
|
|
assert not (code / "hermes_cli/tui_dist").exists()
|
|
assert not (code / "hermes_cli/web_dist").exists()
|
|
probe = subprocess.run([str(out / "bin/probe")], cwd=tmp_path, env=env, capture_output=True, text=True, timeout=30)
|
|
assert probe.returncode == 0, probe.stderr
|
|
assert probe.stdout.strip() == "native fixture"
|
|
assert not (tmp_path / "private").exists()
|
|
(site / "changed.py").write_text("changed = True")
|
|
result = subprocess.run(command, cwd=tmp_path, env=env, capture_output=True, text=True, timeout=30)
|
|
assert result.returncode != 0
|
|
assert "prepare" in result.stderr
|
|
assert not (out / "manifest.json").exists()
|