From 8dbfe5e321fe8706c5f954021e182192221cc534 Mon Sep 17 00:00:00 2001 From: Anton Afanasyeu Date: Sat, 4 Jul 2026 11:28:07 +0200 Subject: [PATCH] fix deploy-ac-broadcast: source from monorepo NFS; remove broadcast from CORE subs Co-authored-by: Cursor --- sim/cluster0/cluster.env | 2 +- sim/cluster0/scripts/deploy-ac-broadcast.sh | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sim/cluster0/cluster.env b/sim/cluster0/cluster.env index 6c6d973..5c96d7a 100644 --- a/sim/cluster0/cluster.env +++ b/sim/cluster0/cluster.env @@ -33,7 +33,7 @@ AC_WORKSPACE_ORIGIN=git://f0xx.org/ac/ac-workspace AC_WORKSPACE_ROOT=/var/www/ac/workspace AC_GIT_BRANCH=next # Minimal submodules for first workspace init (fast path) -AC_SUBMODULES_CORE="ac-platform-db ac-platform-php ac-platform-web ac-platform-edge ac-deploy ac-docs ac-scripts ac-ms-url-shortener ac-be-hub ac-ms-identity ac-ms-broadcast ac-ms-sfu-signaling" +AC_SUBMODULES_CORE="ac-platform-db ac-platform-php ac-platform-web ac-platform-edge ac-deploy ac-docs ac-scripts ac-ms-url-shortener ac-be-hub ac-ms-identity ac-ms-sfu-signaling" # Full set required by compose-lab-backend.sh (init after workspace clone) AC_SUBMODULES_COMPOSE="ac-platform-php ac-platform-web ac-ms-identity ac-ms-rbac ac-ms-devices ac-ms-issues ac-ms-tickets ac-ms-graphs ac-ms-remote-access ac-be-auth ac-be-issues ac-be-tickets ac-be-graphs ac-be-remote-access ac-be-access ac-be-builder ac-ms-build" URL_SHORTENER_ORIGIN=git://f0xx.org/ac/ac-ms-url-shortener diff --git a/sim/cluster0/scripts/deploy-ac-broadcast.sh b/sim/cluster0/scripts/deploy-ac-broadcast.sh index 3658b16..cc5703f 100755 --- a/sim/cluster0/scripts/deploy-ac-broadcast.sh +++ b/sim/cluster0/scripts/deploy-ac-broadcast.sh @@ -8,10 +8,17 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd)" load_cluster_env WS="${AC_WORKSPACE_ROOT:-/var/www/ac/workspace}" -BROADCAST_SRC="${WS}/ac-ms-broadcast" BROADCAST_DEST="/var/www/ac/broadcast" - -[ -d "$BROADCAST_SRC" ] || { log "skip deploy-ac-broadcast: ac-ms-broadcast not in workspace"; return 0; } +# Prefer NFS monorepo path (ac-ms-broadcast is a directory in the main ac monorepo, not a separate submodule) +AC_REPO="${AC_MONOREPO_ROOT:-/mnt/repos/ac}" +if [ -d "${AC_REPO}/ac-ms-broadcast" ]; then + BROADCAST_SRC="${AC_REPO}/ac-ms-broadcast" +elif [ -d "${WS}/ac-ms-broadcast" ]; then + BROADCAST_SRC="${WS}/ac-ms-broadcast" +else + log "skip deploy-ac-broadcast: ac-ms-broadcast not found" + return 0 +fi log "deploy ac-ms-broadcast → ${BROADCAST_DEST}" mkdir -p "$BROADCAST_DEST"