Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
yaml-paths: ".github/workflows/ci.yml"
release-notes-extra: |
CPython 3.12.3 distribution for Nanvix with pure Python pip packages.
docker-image: "ghcr.io/nanvix/toolchain-python@sha256:2ef7213bfff85e927f18d8f0fc53063b9c6ffed236a6b30c92f6b4e148c2dec4" # yamllint disable-line rule:line-length

Check warning on line 42 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / ci / Format & Lint

42:127 [comments] too few spaces before comment
secrets:
GH_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN || secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -95,7 +95,7 @@
tar -xzf $tarball.FullName -C linux-build
$ramfs = Get-ChildItem linux-build -Recurse -Filter "nanvix_rootfs.img" | Select-Object -First 1
if (-not $ramfs) { Write-Error "nanvix_rootfs.img not found in tarball"; exit 1 }
$dest = Join-Path $env:GITHUB_WORKSPACE ".nanvix" "nanvix_rootfs.img"
$dest = Join-Path $env:GITHUB_WORKSPACE ".nanvix" "out" "test" "nanvix_rootfs.img"
New-Item -ItemType Directory -Force -Path (Split-Path $dest) | Out-Null
Copy-Item $ramfs.FullName $dest
Write-Host "Placed ramfs at $dest ($('{0:N0}' -f (Get-Item $dest).Length) bytes)"
Expand Down
11 changes: 6 additions & 5 deletions .nanvix/src/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from nanvix_zutil import paths
from nanvix_zutil.exitcodes import EXIT_BUILD_FAILURE, EXIT_MISSING_DEP
from nanvix_zutil.helpers import InitRdArgs
from nanvix_zutil.paths import nanvix_root, repo_root
from nanvix_zutil.paths import nanvix_root, repo_root, test_out

from .lib import LibMixin, mkramfs_binary, nanvixd_binary

Expand Down Expand Up @@ -90,7 +90,7 @@ def _ensure_ramfs(self, sysroot: Path) -> Path:
if self._ramfs_img and self._ramfs_img.is_file():
return self._ramfs_img

work_dir = nanvix_root()
work_dir = test_out()
img = work_dir / "nanvix_rootfs.img"
sentinel = work_dir / ".ramfs-built"
current_hash = self._ramfs_input_hash(sysroot)
Expand Down Expand Up @@ -118,10 +118,11 @@ def _build_ramfs(self, sysroot: Path) -> Path:
if self._ramfs_img and self._ramfs_img.is_file():
return self._ramfs_img

work_dir = nanvix_root()
work_dir = test_out()
img = work_dir / "nanvix_rootfs.img"
sentinel = work_dir / ".ramfs-built"
current_hash = self._ramfs_input_hash(sysroot)
work_dir.mkdir(parents=True, exist_ok=True)
Comment on lines +121 to +125

# Skip rebuild if ramfs image and sentinel are up-to-date
if (
Expand All @@ -133,7 +134,7 @@ def _build_ramfs(self, sysroot: Path) -> Path:
self._ramfs_img = img
return img

stripped = work_dir / "stripped-sysroot"
stripped = nanvix_root() / "stripped-sysroot"
self._create_stripped_sysroot(sysroot, stripped)
self._stripped_sysroot = stripped

Expand All @@ -148,7 +149,7 @@ def _build_ramfs(self, sysroot: Path) -> Path:
# Docker (Python 3.12) and placed at the sysroot root.

# Generate build manifests for post-build inspection
self._write_build_manifests(sysroot, stripped, work_dir)
self._write_build_manifests(sysroot, stripped, nanvix_root())
Comment on lines 151 to +152

log.info("building ramfs image for standalone mode")
mkramfs = str((sysroot / "bin" / mkramfs_binary()).resolve())
Expand Down
6 changes: 3 additions & 3 deletions .nanvix/src/clean.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from pathlib import Path

from nanvix_zutil import CFG_SYSROOT, log, paths
from nanvix_zutil.paths import nanvix_root, repo_root
from nanvix_zutil.paths import repo_root, test_out

from .lib import LibMixin

Expand All @@ -29,9 +29,9 @@ def clean(self) -> None:

# Clean ramfs artifacts
self._cleanup_ramfs()
ramfs_img = nanvix_root() / "nanvix_rootfs.img"
ramfs_img = test_out() / "nanvix_rootfs.img"
ramfs_img.unlink(missing_ok=True)
ramfs_sentinel = nanvix_root() / ".ramfs-built"
ramfs_sentinel = test_out() / ".ramfs-built"
ramfs_sentinel.unlink(missing_ok=True)
Comment on lines +32 to 35
Comment on lines 31 to 35

# Clean initrd
Expand Down
Loading