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: 2 additions & 2 deletions .github/workflows/nanvix-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
jobs:
ci:
if: github.event_name != 'schedule' && github.event_name != 'workflow_dispatch'
uses: nanvix/workflows/.github/workflows/nanvix-ci.yml@v2.2.0
uses: nanvix/workflows/.github/workflows/nanvix-ci.yml@v2.3.0
with:
platforms: '["microvm"]'
process-modes: '["multi-process","single-process","standalone"]'
Expand All @@ -36,14 +36,14 @@
standalone-test-args: "test-functional"
caller-event-name: ${{ github.event_name }}
windows-test: true
docker-image: "ghcr.io/nanvix/toolchain-gcc:sha-34a3641" # yamllint disable-line rule:line-length

Check warning on line 39 in .github/workflows/nanvix-ci.yml

View workflow job for this annotation

GitHub Actions / ci / Format & Lint

39:64 [comments] too few spaces before comment
secrets:
GH_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}

ci-scheduled:
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
uses: nanvix/workflows/.github/workflows/nanvix-ci.yml@v2.2.0
uses: nanvix/workflows/.github/workflows/nanvix-ci.yml@v2.3.0
with:
platforms: '["microvm"]'
process-modes: '["multi-process","single-process","standalone"]'
Expand All @@ -53,7 +53,7 @@
standalone-test-args: "test-functional"
caller-event-name: 'schedule'
windows-test: true
docker-image: "ghcr.io/nanvix/toolchain-gcc:sha-34a3641" # yamllint disable-line rule:line-length

Check warning on line 56 in .github/workflows/nanvix-ci.yml

View workflow job for this annotation

GitHub Actions / ci / Format & Lint

56:64 [comments] too few spaces before comment
secrets:
GH_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}
11 changes: 5 additions & 6 deletions .nanvix/z.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@ def _run_tests_windows(self) -> None:

test_allowlist = {"test_libxml2.elf"}
test_binaries: list[Path] = []
for candidate in [repo_root(), repo_root() / "build"]:
# test_out() is the windows-test artifact overlay.
for candidate in [test_out(), repo_root(), repo_root() / "build"]:
if candidate.is_dir():
Comment on lines +287 to 289
for elf in sorted(candidate.glob("*.elf")):
if elf.name in test_allowlist and elf.name not in {
Expand Down Expand Up @@ -313,12 +314,10 @@ def _run_tests_windows(self) -> None:
initrd: Path | None = None
try:
if binary.resolve() != repo_elf.resolve():
if repo_elf.exists():
raise FileExistsError(
f"refusing to clobber existing {repo_elf}"
)
# Don't clobber a dev's prior repo-root build.
preexisted = repo_elf.exists()
shutil.copy2(binary, repo_elf)
copied_elf = True
copied_elf = not preexisted
Comment on lines 316 to +320
initrd = make_initrd(self, binary.name, test=True)
with tempfile.TemporaryDirectory(prefix=f"nanvix_{name}_") as tmpdir:
tmpdir_path = Path(tmpdir)
Expand Down