Consolidate dist/ into cache/ and release/ subdirs
All intermediate build artifacts (binaries, live-build work dirs, overlay stages, NVIDIA/NCCL/cuBLAS/john caches) now live under dist/cache/. Final ISOs go to dist/release/ instead of scattered dist/easy-bee-v*/ and iso/out/. dist/ is already gitignored, iso/out/ entry removed as redundant. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -27,7 +27,7 @@ BUILDER_HOST="${BUILDER_HOST:-}"
|
||||
BUILDER_USER="${BUILDER_USER:-}"
|
||||
|
||||
# Cache lives inside the repo under dist/ (gitignored).
|
||||
CACHE_DIR="${REPO_ROOT}/dist/container-cache"
|
||||
CACHE_DIR="${REPO_ROOT}/dist/cache"
|
||||
|
||||
# Forward all arguments as-is to the underlying build script.
|
||||
EXTRA_ARGS="$*"
|
||||
@@ -79,7 +79,7 @@ screen -S bee-build -X quit 2>/dev/null || true
|
||||
|
||||
echo "--- starting build in screen session (survives SSH disconnect) ---"
|
||||
echo "--- log: \$LOG ---"
|
||||
screen -dmS bee-build sh -c "sh iso/builder/build-in-container.sh --cache-dir \$REPO/dist/container-cache ${EXTRA_ARGS} > \$LOG 2>&1; echo \$? > /tmp/bee-build-exit"
|
||||
screen -dmS bee-build sh -c "sh iso/builder/build-in-container.sh --cache-dir \$REPO/dist/cache ${EXTRA_ARGS} > \$LOG 2>&1; echo \$? > /tmp/bee-build-exit"
|
||||
|
||||
echo "--- streaming build log (Ctrl+C safe -- build continues on VM) ---"
|
||||
tail -n +1 -f "\$LOG" 2>/dev/null &
|
||||
@@ -98,7 +98,7 @@ ENDSSH
|
||||
|
||||
echo ""
|
||||
echo "=== downloading ISO ==="
|
||||
LOCAL_ISO_DIR="${REPO_ROOT}/iso/out"
|
||||
LOCAL_ISO_DIR="${REPO_ROOT}/dist/release"
|
||||
mkdir -p "${LOCAL_ISO_DIR}"
|
||||
if command -v rsync >/dev/null 2>&1 && ssh -o StrictHostKeyChecking=no "${BUILDER_USER}@${BUILDER_HOST}" command -v rsync >/dev/null 2>&1; then
|
||||
rsync -az --progress \
|
||||
|
||||
Reference in New Issue
Block a user