From fe68248b5730d93c6960f3e8f11ef93f52bb9785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=98=D0=9D?= Date: Sat, 30 May 2026 22:20:03 +0300 Subject: [PATCH] =?UTF-8?q?ci:=20S1-=D0=B4=D0=B5=D0=BF=D0=BB=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D1=83?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D0=B9=20(continue-on-error=20+=20ConnectTime?= =?UTF-8?q?out=2020=D1=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit S1 в downtime — деплой не должен валиться, главное доставить на S2. S1 rsync/verify помечены continue-on-error; S2 остаётся строгим. Co-Authored-By: Claude Opus 4.8 --- .gitea/workflows/ci.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index adb64c6..917275e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -132,23 +132,27 @@ jobs: chmod 600 ~/.ssh/known_hosts - name: Install rsync run: apt-get update -qq && apt-get install -y rsync openssh-client + # S1 — НЕ блокирующий: при недоступности S1 (downtime) деплой не должен + # валиться, главное доставить на S2. ConnectTimeout 20с чтобы не висеть. - name: Deploy to S1 (85.175.7.40:1998) + continue-on-error: true run: | rsync -az --delete-after --human-readable --exclude=wiki --exclude=kubikon-assets \ - -e "ssh -i ~/.ssh/id_deploy -o UserKnownHostsFile=~/.ssh/known_hosts -p 1998" \ + -e "ssh -i ~/.ssh/id_deploy -o UserKnownHostsFile=~/.ssh/known_hosts -o ConnectTimeout=20 -p 1998" \ build/ min@85.175.7.40:/var/www/rublox-player/build/ - name: Deploy to S2 (192.168.0.124:22, runner в той же сети) run: | rsync -az --delete-after --human-readable --exclude=wiki --exclude=kubikon-assets \ -e "ssh -i ~/.ssh/id_deploy -o UserKnownHostsFile=~/.ssh/known_hosts -p 22" \ build/ min@192.168.0.124:/var/www/rublox-player/build/ - - name: Verify deploy + - name: Verify S1 (не блокирующий) + continue-on-error: true run: | - echo "=== S1 ===" - ssh -i ~/.ssh/id_deploy -o UserKnownHostsFile=~/.ssh/known_hosts -p 1998 \ + ssh -i ~/.ssh/id_deploy -o UserKnownHostsFile=~/.ssh/known_hosts -o ConnectTimeout=20 -p 1998 \ min@85.175.7.40 \ "ls /var/www/rublox-player/build/index.html && du -sh /var/www/rublox-player/build/" - echo "=== S2 ===" + - name: Verify S2 (обязательный) + run: | ssh -i ~/.ssh/id_deploy -o UserKnownHostsFile=~/.ssh/known_hosts -p 22 \ min@192.168.0.124 \ "ls /var/www/rublox-player/build/index.html && du -sh /var/www/rublox-player/build/"