diff --git a/.claude/skills/xce-test-resources/run-resource-verify.sh b/.claude/skills/xce-test-resources/run-resource-verify.sh index 5068cf00..0124e32f 100755 --- a/.claude/skills/xce-test-resources/run-resource-verify.sh +++ b/.claude/skills/xce-test-resources/run-resource-verify.sh @@ -200,7 +200,7 @@ DEPLOY_HA="$REPO/src/tools/deploy-ha.sh" BUILD_DIR="${XCE_RESVERIFY_BUILD_DIR:-$REPO/src/xce.build}" BINARY="${XCE_RESVERIFY_BIN:-$BUILD_DIR/controller/xce_controller}" SCHED_BIN="${XCE_RESVERIFY_SCHED_BIN:-$BUILD_DIR/scheduler/xce_scheduler}" -APISERVER_BIN="${XCE_RESVERIFY_APISERVER_BIN:-/tmp/apiserver}" +APISERVER_BIN="${XCE_RESVERIFY_APISERVER_BIN:-$BUILD_DIR/frontend/apiserver/xce_apiserver}" # xce_test -- drives injection (task 6.1) via its worker-context `join`/ # `resupdate` commands (same binary xce-test-ha's run-ha-soak.sh uses, same # build dir as $BINARY since both come from the controller meson target). @@ -347,7 +347,7 @@ register_trap() { precondition_checks() { [ -x "$BINARY" ] || fail "controller binary missing: $BINARY (run /xce-build controller)" [ -x "$SCHED_BIN" ] || fail "scheduler binary missing: $SCHED_BIN (run /xce-build scheduler) -- required, this skill verifies the scheduler layer" - [ -x "$APISERVER_BIN" ] || fail "apiserver binary missing: $APISERVER_BIN (cd src/frontend && make build-server, or the CGO-flags workaround -- see tasks.md's Implementation Notes) -- required, this skill verifies the apiserver layer" + [ -x "$APISERVER_BIN" ] || fail "apiserver binary missing: $APISERVER_BIN (run /xce-build apiserver) -- required, this skill verifies the apiserver layer" [ -x "$XT" ] || fail "xce_test binary missing: $XT (run /xce-build controller) -- required to join a synthetic worker and run resupdate" command -v nix >/dev/null 2>&1 || fail "nix not found on PATH -- required to resolve the deploy-environment bash and invoke deploy-ha.sh" } diff --git a/.kiro/specs/eliminate-frontend-makefile/tasks.md b/.kiro/specs/eliminate-frontend-makefile/tasks.md index 16049329..80b6b11a 100644 --- a/.kiro/specs/eliminate-frontend-makefile/tasks.md +++ b/.kiro/specs/eliminate-frontend-makefile/tasks.md @@ -22,7 +22,7 @@ - _Boundary: xce-build.sh_ - [ ] 3. Integration: eliminate every remaining live reference to the Makefile -- [ ] 3.1 (P) Fix run-resource-verify.sh's apiserver-binary discovery +- [x] 3.1 (P) Fix run-resource-verify.sh's apiserver-binary discovery - Change `APISERVER_BIN`'s default from the fixed `/tmp/apiserver` path to the same `$BUILD_DIR//`-relative convention its sibling binaries (`BINARY`, `SCHED_BIN`, `XT`) already use, and update its failure message to name `/xce-build apiserver` instead of the Makefile target - Observable: with a binary present only in the Meson build dir (no `/tmp/apiserver`), the script locates and uses it; with neither present, the failure message names `/xce-build apiserver`, not `make build-server` - _Requirements: 5.1, 5.2, 5.3_