Merge branch 'ocaml-vm'

The opam base image has dune in the switch but not on PATH.
RUN eval $(opam env) doesn't persist across layers. Install dune
explicitly and set PATH so dune is available in build steps.

Also fix run-tests.sh to respect QUICK env var from caller
(was being overwritten to false).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.gitea/Dockerfile.test

@@ -43,8 +43,9 @@ COPY --chown=opam:opam hosts/ocaml/dune-project ./hosts/ocaml/
 COPY --chown=opam:opam hosts/ocaml/lib/         ./hosts/ocaml/lib/
 COPY --chown=opam:opam hosts/ocaml/bin/         ./hosts/ocaml/bin/
 
-# Copy spec, web, shared (needed by bootstrappers + tests)
+# Copy spec, lib, web, shared (needed by bootstrappers + tests)
 COPY --chown=opam:opam spec/           ./spec/
+COPY --chown=opam:opam lib/            ./lib/
 COPY --chown=opam:opam web/            ./web/
 COPY --chown=opam:opam shared/sx/      ./shared/sx/
 COPY --chown=opam:opam shared/__init__.py ./shared/__init__.py

.gitea/run-ci-tests.sh

@@ -49,7 +49,7 @@ run_suite "OCaml bridge — custom special forms + web-forms" \
   python3 -c "
 from shared.sx.ocaml_sync import OcamlSync
 bridge = OcamlSync()
-for f in ['spec/parser.sx', 'spec/render.sx', 'web/adapter-html.sx', 'web/adapter-sx.sx', 'web/web-forms.sx', 'spec/freeze.sx']:
+for f in ['spec/parser.sx', 'spec/render.sx', 'web/adapter-html.sx', 'web/adapter-sx.sx', 'web/web-forms.sx', 'lib/freeze.sx']:
     bridge.load(f)
 ok = 0; fail = 0
 def check(name, expr, expected=None):

deploy.sh

@@ -53,8 +53,8 @@ fi
 echo "Building: ${BUILD[*]}"
 echo ""
 
-# --- Run all tests before deploying ---
-if ! ./run-tests.sh; then
+# --- Run unit tests before deploying (skip Playwright — needs running server) ---
+if ! QUICK=true ./run-tests.sh; then
   exit 1
 fi
 

run-tests.sh

@@ -11,8 +11,8 @@ set -euo pipefail
 
 cd "$(dirname "$0")"
 
-QUICK=false
-SX_ONLY=false
+QUICK="${QUICK:-false}"
+SX_ONLY="${SX_ONLY:-false}"
 for arg in "$@"; do
   case "$arg" in
     --quick)   QUICK=true ;;
@@ -73,7 +73,7 @@ run_suite "OCaml bridge — custom special forms + web-forms" \
 from shared.sx.ocaml_sync import OcamlSync
 bridge = OcamlSync()
 # Load exactly what the server does (no evaluator.sx!)
-for f in ['spec/parser.sx', 'spec/render.sx', 'web/adapter-html.sx', 'web/adapter-sx.sx', 'web/web-forms.sx', 'spec/freeze.sx']:
+for f in ['spec/parser.sx', 'spec/render.sx', 'web/adapter-html.sx', 'web/adapter-sx.sx', 'web/web-forms.sx', 'lib/freeze.sx']:
     bridge.load(f)
 ok = 0; fail = 0
 def check(name, expr, expected=None):

sx/Dockerfile

@@ -3,12 +3,14 @@
 # --- Stage 1: Build OCaml SX kernel ---
 FROM ocaml/opam:debian-12-ocaml-5.2 AS ocaml-build
 USER opam
+RUN opam install dune -y
+ENV PATH="/home/opam/.opam/5.2/bin:${PATH}"
 WORKDIR /home/opam/sx
 COPY --chown=opam:opam hosts/ocaml/dune-project ./
 COPY --chown=opam:opam hosts/ocaml/lib/ ./lib/
 COPY --chown=opam:opam hosts/ocaml/bin/dune hosts/ocaml/bin/run_tests.ml \
      hosts/ocaml/bin/debug_set.ml hosts/ocaml/bin/sx_server.ml ./bin/
-RUN eval $(opam env) && dune build bin/sx_server.exe
+RUN dune build bin/sx_server.exe
 
 # --- Stage 2: Python app ---
 FROM python:3.11-slim AS base