From 8310217d24e64408f19f130fe074b830c5d0f92b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 30 Jun 2026 14:27:01 +0000 Subject: [PATCH 1/2] [ci] E: Update zutils to v0.14.0 --- .zutils-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zutils-version b/.zutils-version index 6345c2168f..4a29f93bbe 100644 --- a/.zutils-version +++ b/.zutils-version @@ -1 +1 @@ -v0.13.0 +v0.14.0 From b5d3412e5d84db6dc636c73842638e7ca8b98635 Mon Sep 17 00:00:00 2001 From: ada Date: Tue, 30 Jun 2026 10:06:12 -0500 Subject: [PATCH 2/2] fix: adapt make_initrd callsites to v0.14.0 signature Drop the obsolete repo-root staging dance in the windows test loop now that make_initrd accepts arbitrary input paths. --- .nanvix/.gitignore | 1 + .nanvix/z.py | 19 ++++--------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.nanvix/.gitignore b/.nanvix/.gitignore index 5e18c386f9..920fbb8c6b 100644 --- a/.nanvix/.gitignore +++ b/.nanvix/.gitignore @@ -3,6 +3,7 @@ venv cache sysroot buildroot +out .yamllint.yml black.toml env.json diff --git a/.nanvix/z.py b/.nanvix/z.py index 3198756018..7ac701cc89 100644 --- a/.nanvix/z.py +++ b/.nanvix/z.py @@ -175,8 +175,8 @@ def build(self) -> None: # Build artifacts to copy back from the container to the host after # the Windows single-shot build completes. Two categories: - # * legacy repo-root paths needed at runtime (sqlite3.elf is - # resolved by make_initrd via repo_root()/app); + # * legacy repo-root paths needed at runtime (sqlite3.elf is read + # from repo_root() by the standalone test callsite below); # * install-staged paths under .nanvix/out/release/{lib,include,bin} # required by `./z release` (see _staged_output_files()). _WINDOWS_OUTPUT_FILES = [ @@ -364,7 +364,7 @@ def _run_functional_standalone(self) -> None: print(" Running sqlite3.elf via nanvixd standalone...") # Bundle sqlite3.elf + daemons into an initrd. - initrd = make_initrd(self, "sqlite3.elf", test=True) + initrd = make_initrd(self, repo_root() / "sqlite3.elf", test_out()) sql_file = repo_root() / ".nanvix" / "functional_test.sql" @@ -468,18 +468,9 @@ def _run_tests_windows(self) -> None: for binary in test_binaries: name = binary.stem print(f"RUN {name}...") - # make_initrd resolves binaries relative to repo_root; - # copy the ELF there temporarily unless it already lives there. - repo_elf = repo_root() / binary.name - copied_elf = False - if binary.resolve() != repo_elf.resolve(): - # Preserve a pre-existing repo-root ELF on cleanup. - preexisted = repo_elf.exists() - shutil.copy2(binary, repo_elf) - copied_elf = not preexisted initrd: Path | None = None try: - initrd = make_initrd(self, binary.name, test=True) + initrd = make_initrd(self, binary, test_out()) with tempfile.TemporaryDirectory( prefix=f"nanvix_{name}_", ignore_cleanup_errors=True, @@ -522,8 +513,6 @@ def _run_tests_windows(self) -> None: finally: if initrd is not None and initrd.exists(): initrd.unlink() - if copied_elf and repo_elf.exists(): - repo_elf.unlink() if failed: msg = f"{len(failed)} test(s) failed: {' '.join(failed)}"