From a77b500e508cc0f76836418fc9054effcb1247eb Mon Sep 17 00:00:00 2001 From: sepehr Date: Fri, 15 May 2026 15:23:17 +0200 Subject: [PATCH] fix: merge monitoring deploy into single job Monitoring was in a separate blocked job. Now everything runs in one SSH session so Prometheus + Grafana always deploy with the app. Co-Authored-By: Claude Opus 4.7 --- .gitea/workflows/deploy.yml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 9fafde0..d43375c 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -66,6 +66,10 @@ jobs: echo "=== Deploy summary ===" docker compose ps echo "Health: $(curl -sf http://localhost:8001/health 2>/dev/null || echo 'FAILED')" + + echo "=== Starting monitoring ===" + docker compose -f docker-compose.yml -f docker-compose.monitoring.yml up -d prometheus grafana node-exporter cadvisor || true + docker compose -f docker-compose.yml -f docker-compose.monitoring.yml ps || true ENDSSH - name: Wait for frontend @@ -86,24 +90,3 @@ jobs: - name: Cleanup if: always() run: ssh root@192.168.1.151 "docker image prune -f" || true - - deploy-monitoring: - name: Deploy Monitoring - runs-on: ubuntu-24.04 - needs: deploy - steps: - - name: Setup SSH - run: | - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan -H 192.168.1.151 >> ~/.ssh/known_hosts - - - name: Start monitoring - run: | - ssh root@192.168.1.151 << 'ENDSSH' - cd /opt/wordly - docker compose -f docker-compose.yml -f docker-compose.monitoring.yml up -d prometheus grafana node-exporter cadvisor - docker compose -f docker-compose.yml -f docker-compose.monitoring.yml ps - ENDSSH - continue-on-error: true