s1: flock autodeploy+auto-merge versionados + guard CI/no-/srv #58
Open
ci-bot
wants to merge 2 commits from
r31-s1-lock-ci into main
pull from: r31-s1-lock-ci
merge into: :main
:main
:r31-doc-final
:r31-doc
:r31-p1-units
:r31-s1-lock-ci
:r30b-docs
:decisions
:r25-doc
:codeowners
:r24-doc
:recovery-uncommitted-20261101
:voz-v3
:adsense-r23
:r22-doc
:r21-doc
:demo-rojo-r21
:r20-doc
:demo-rojo-v2
:ci-pipefail-real
:demo-rojo-r20
:r19-doc
:ci-pipefail
:r19-recover-r18doc
:r16-r9-gemini
:fuentes-automaticas
:ci-host-mode
:docs-bitcoinhotels-publish
:ci-isolation
:fix-ci-port
:ci-test-trivial
:runtime/single-outbox-watcher
:sessions/2026-11-01-opencode
:credential-leak-guard
:hardcap-admin-auth2
:hardcap-containment
:containment-2
:containment-outbox
:fix-backup-log-redaction
:backup-sizing-alerts
:restore-runbook
:backup-pull-user
:backup-generation
:identity-no-jurisdiction
:spanish-negations
:audit-chain-hardening
:decouple-operator-key
:identity-reframe
:audit-round2
:audit-fixes
:audit-update
:lint-fix
:audit
:monitor
:publisher
:mail-negotiator
:scanner-executor
:skeleton
2
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 coder-agent
|
6b1b2f83b7 | ci: retrigger (workdir_parent absoluto en el runner) | ||
|
coder-agent
|
5cc3fd6419 |
s1: autodeploy+auto-merge con flock compartido (versionados) + guard de workflow
- Incidente 02:06:29Z: el rollback del autodeploy (git reset --hard $OLD) pisó la rama e2-fuentes-y-sellos porque el árbol cambió de branch a mitad de deploy. Causa: ninguna exclusión mutua entre autodeploy, auto-merger y ops manuales sobre los mismos árboles. - Lock: /run/lock/cayce-git-ops.lock (tmpfiles.d, 0664 root:ubuntu). autodeploy flock -n (salta ciclo), auto-merge flock -w 240 (espera). - Guard en ci.yml: un job cuyo workspace caiga bajo /srv/* revienta. |