Skip to content

[ci] Sync zutils v0.8.5 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ppenna wants to merge 1 commit into from
Closed

[ci] Sync zutils v0.8.5 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
if: github.event_name != 'schedule' && github.event_name != 'workflow_dispatch'
uses: nanvix/workflows/.github/workflows/nanvix-ci.yml@v2.0.1
with:
zutil-version: "v0.8.5"
zutil-version: "v0.9.0"
platforms: '["microvm"]'
process-modes: '["multi-process","single-process","standalone"]'
memory-sizes: '["256mb"]'
Expand All @@ -36,7 +36,7 @@
skip-full-test-modes: '["multi-process","single-process","standalone"]'
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 }}
Expand All @@ -45,7 +45,7 @@
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
uses: nanvix/workflows/.github/workflows/nanvix-ci.yml@v2.0.1
with:
zutil-version: "v0.8.5"
zutil-version: "v0.9.0"
platforms: '["microvm"]'
process-modes: '["multi-process","single-process","standalone"]'
memory-sizes: '["256mb"]'
Expand All @@ -53,7 +53,7 @@
skip-full-test-modes: '["multi-process","single-process","standalone"]'
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 }}
2 changes: 1 addition & 1 deletion .nanvix/nanvix.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "libxml2"
version = "2.12.9"
nanvix-version = "0.13.17"
nanvix-version = "0.14.0"

[builds]
[builds.matrix]
Expand Down
10 changes: 8 additions & 2 deletions z.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $zutilVersion = if ($env:NANVIX_ZUTIL_VERSION) {
$env:NANVIX_ZUTIL_VERSION
}
else {
"0.8.5"
"0.9.0"
}
$zutilVersion = $zutilVersion -replace "^v", ""

Expand All @@ -42,9 +42,10 @@ catch {
}

function Bootstrap {
param([string]$Reason = "not found")
# Pin nanvix-zutil version for reproducible bootstrapping.
# Override with NANVIX_ZUTIL_VERSION env var if needed.
Write-Information "nanvix-zutil not found -- bootstrapping nanvix-zutil==${zutilVersion}..." -InformationAction Continue
Write-Information "nanvix-zutil ${Reason} -- bootstrapping nanvix-zutil==${zutilVersion}..." -InformationAction Continue

$wheelUrl = "https://github.com/nanvix/zutils/releases/download/v${zutilVersion}/nanvix_zutil-${zutilVersion}-py3-none-any.whl"

Expand Down Expand Up @@ -115,6 +116,11 @@ else {
$bin = "nanvix-zutil"
if ($zutilGlobalVersion -ne "nanvix-zutil ${zutilVersion}") {
Write-Warning "nanvix-zutil global install does not match expected version. Expected ${zutilVersion}, found ${zutilGlobalVersion}."
Bootstrap "version mismatch"
if (-not (Test-Path $venvZutil)) {
throw "Bootstrap completed but $venvZutil not found."
}
$bin = $venvZutil
}
}

Expand Down
7 changes: 5 additions & 2 deletions z.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

set -euo pipefail

PINNED_VERSION="0.8.5"
PINNED_VERSION="0.9.0"
RAW_ZUTIL_VERSION="${NANVIX_ZUTIL_VERSION:-$PINNED_VERSION}"
ZUTIL_VERSION="${RAW_ZUTIL_VERSION#v}"
REPO_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd -P)"
Expand All @@ -31,7 +31,8 @@ ZUTIL_GLOBAL_VERSION="$(nanvix-zutil --version 2>/dev/null || true)"
function bootstrap() {
# Pin nanvix-zutil version for reproducible bootstrapping.
# Override with NANVIX_ZUTIL_VERSION env var if needed.
echo "nanvix-zutil not found -- bootstrapping nanvix-zutil==${ZUTIL_VERSION}..." >&2
local reason="${1:-not found}"
echo "nanvix-zutil ${reason} -- bootstrapping nanvix-zutil==${ZUTIL_VERSION}..." >&2

if ! command -v python3 &>/dev/null; then
echo "Error: python3 not found. Install Python 3 and ensure python3 is on PATH." >&2
Expand Down Expand Up @@ -69,6 +70,8 @@ else
BIN="nanvix-zutil"
if [ "$ZUTIL_GLOBAL_VERSION" != "nanvix-zutil ${ZUTIL_VERSION}" ]; then
echo "Warning: nanvix-zutil global install does not match expected version. Expected ${ZUTIL_VERSION}, found ${ZUTIL_GLOBAL_VERSION}." >&2
bootstrap "version mismatch"
BIN="$VENV_BIN"
fi
fi

Expand Down
Loading