Skip to content
Merged
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
23 changes: 4 additions & 19 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ jobs:
path: |
std/kernel/bin/main.wasm
std/shell/bin/shell.wasm
std/shell/bin/shell.capnpc
std/status/bin/status.wasm
examples/*/bin/
retention-days: 1
Expand Down Expand Up @@ -385,18 +384,16 @@ jobs:
# /usr/share/wetware/kernel/ → kernel image (mounted as base)
# /usr/share/wetware/shell/ → shell image (overlaid on kernel)
# The daemon mounts both as separate root layers; the shell layer
# provides bin/shell.wasm + bin/shell.capnpc (loaded by the
# AdminUdsService at startup — shell is a daemon built-in, not
# an init.d-registered vat).
# provides bin/shell.wasm. Shell is a daemon built-in, not an
# init.d-registered vat.
mkdir -p wetware/kernel/bin
mkdir -p wetware/shell/bin

# Kernel layer: bin/main.wasm is required at the merged root.
cp wasm/std/kernel/bin/main.wasm wetware/kernel/bin/main.wasm

# Shell layer: WASM + schema.
# Shell layer: WASM.
cp wasm/std/shell/bin/shell.wasm wetware/shell/bin/shell.wasm
cp wasm/std/shell/bin/shell.capnpc wetware/shell/bin/shell.capnpc

cp ../Containerfile.deploy Containerfile

Expand Down Expand Up @@ -542,8 +539,7 @@ jobs:
STAGE=/tmp/release-tree
mkdir -p "$STAGE/bin/ww/linux/x86_64" "$STAGE/bin/ww/linux/aarch64"
mkdir -p "$STAGE/bin/ww/macos/aarch64" "$STAGE/bin/ww/macos/x86_64"
mkdir -p "$STAGE/include/schema" "$STAGE/lib/ww" "$STAGE/lib/init.d"
mkdir -p "$STAGE/share/schema"
mkdir -p "$STAGE/lib/ww" "$STAGE/lib/init.d"

# VERSION
grep '^version' Cargo.toml | head -1 | sed 's/.*"\(.*\)".*/\1/' > "$STAGE/VERSION"
Expand Down Expand Up @@ -589,17 +585,6 @@ jobs:
fi
done

# Compiled schemas (.capnpc) — co-located with their WASM in bin/
# so init scripts can `(load "bin/shell.capnpc")` relative to the
# merged image root.
cp artifacts/wasm-artifacts/std/shell/bin/shell.capnpc "$STAGE/bin/shell.capnpc"

# Human-readable .capnp schemas
cp capnp/shell.capnp "$STAGE/include/schema/" 2>/dev/null || true
for ex_capnp in examples/*/*.capnp; do
[ -f "$ex_capnp" ] && cp "$ex_capnp" "$STAGE/include/schema/"
done

# Glia stdlib
cp std/lib/ww/*.glia "$STAGE/lib/ww/" 2>/dev/null || true

Expand Down