autodeploy: rollback de hardcap en subshell (no bloquea bitcoinhotels) #64

Merged
ci-bot merged 2 commits from r32-autodeploy-subshell into main 2026-11-03 15:55:06 +00:00
Showing only changes of commit c17ac080cb - Show all commits
+5
View File
@@ -99,6 +99,10 @@ say "entity → $(git rev-parse --short HEAD) (tests $PASS/27, watcher OK, live)
# r21: sin DM (no urgente) — dm "entity desplegado: $(git rev-parse --short HEAD) — tests $PASS/27, watcher OK" # r21: sin DM (no urgente) — dm "entity desplegado: $(git rev-parse --short HEAD) — tests $PASS/27, watcher OK"
fi # fin sección entity fi # fin sección entity
# r32: la seccion hardcap corre en SUBSHELL — un ROLLBACK (exit 1) ya no
# aborta los deploys de bitcoinhotels (bug: rollback de hardcap llevaba
# bloqueando bh desde las 15:10 mientras gh#10 espera merge)
(
# ── 2b. hardcap-news → /srv/hardcap-news (GitHub; web, sin PUBLISH_OFF) ───── # ── 2b. hardcap-news → /srv/hardcap-news (GitHub; web, sin PUBLISH_OFF) ─────
cd /srv/hardcap-news || { say "FATAL: sin /srv/hardcap-news"; exit 1; } cd /srv/hardcap-news || { say "FATAL: sin /srv/hardcap-news"; exit 1; }
git fetch -q origin 2>/dev/null git fetch -q origin 2>/dev/null
@@ -138,6 +142,7 @@ if ! git merge-base --is-ancestor origin/main HEAD 2>/dev/null && [ -z "$(git st
fi fi
# ── 3. bitcoinhotels → /srv/bitcoinhotels (web; sin PUBLISH_OFF) ──────────── # ── 3. bitcoinhotels → /srv/bitcoinhotels (web; sin PUBLISH_OFF) ────────────
)
cd /srv/bitcoinhotels || { say "FATAL: sin /srv/bitcoinhotels"; exit 1; } cd /srv/bitcoinhotels || { say "FATAL: sin /srv/bitcoinhotels"; exit 1; }
git fetch -q origin 2>/dev/null git fetch -q origin 2>/dev/null
if ! git merge-base --is-ancestor origin/main HEAD 2>/dev/null && [ -z "$(git status --porcelain)" ]; then if ! git merge-base --is-ancestor origin/main HEAD 2>/dev/null && [ -z "$(git status --porcelain)" ]; then