Skip to content

Commit 5f25400

Browse files
committed
Fix release agent Makefile template path
1 parent 9bae811 commit 5f25400

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

backend/app/tasks/tests/test_cross_bin.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def create_local_source_folder(self, temp_dir, source_root=None):
197197
encoding="utf-8",
198198
)
199199
shutil.copy2(
200-
Path(source_root) / "versions.json",
200+
Path(source_root).parent / "versions.json",
201201
Path(temp_dir) / "versions.json",
202202
)
203203
return str(source_dir)
@@ -246,6 +246,7 @@ async def fake_resolve_prebuilt_entry(**_kwargs):
246246
return None, None
247247

248248
async def fake_generate_agent_build_dir(**kwargs):
249+
assert kwargs["repo_root"] == repo_root
249250
build_dir = Path(kwargs["build_dir"])
250251
build_dir.mkdir(parents=True, exist_ok=True)
251252
(build_dir / "compile_frameos_agent.sh").write_text("#!/bin/sh\n", encoding="utf-8")
@@ -275,15 +276,16 @@ async def fake_generate_agent_build_dir(**kwargs):
275276
monkeypatch.setattr("app.codegen.release_drivers_nim.write_release_waveshare_driver_modules", lambda *_args: None)
276277
monkeypatch.setattr("app.codegen.release_drivers_nim.write_release_driver_libraries", lambda *_args: None)
277278

278-
frameos_root = tmp_path / "frameos"
279+
repo_root = tmp_path / "repo"
280+
frameos_root = repo_root / "frameos"
279281
artifacts_dir = tmp_path / "artifacts"
280-
frameos_root.mkdir()
282+
frameos_root.mkdir(parents=True)
281283
expected_versions = {
282284
"frameos": "2026.5.15+frameos",
283285
"agent": "2026.5.16+agent",
284286
"docker": "2026.5.16+docker",
285287
}
286-
(frameos_root / "versions.json").write_text(json.dumps(expected_versions) + "\n", encoding="utf-8")
288+
(repo_root / "versions.json").write_text(json.dumps(expected_versions) + "\n", encoding="utf-8")
287289

288290
destination = await cross_module.build_release_target("debian-trixie-amd64", frameos_root, artifacts_dir)
289291

backend/bin/cross

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ async def build_release_target(
712712
build_dir=agent_build_dir,
713713
arch=target.arch,
714714
nim_path=nim_path,
715-
repo_root=frameos_root,
715+
repo_root=repo_root,
716716
)
717717
write_release_agent_build_marker(
718718
agent_build_dir,

0 commit comments

Comments
 (0)