Restore working CI with persistent directories

.forgejo/workflows/botserver.yaml

@@ -3,46 +3,133 @@ name: BotServer CI/CD
 on:
   push:
     branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+env:
+  CARGO_BUILD_JOBS: 8
+  CARGO_NET_RETRY: 10
+  RUSTC_WRAPPER: sccache
+  SCCACHE_DIR: /opt/gbo/data/cache/sccache
+  CARGO_HOME: /opt/gbo/data/cache/cargo
+  CARGO_TARGET_DIR: /opt/gbo/data/persistent-botserver/target
+  PATH: /home/gbuser/.cargo/bin:/home/gbuser/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 jobs:
   build:
     runs-on: gbo
 
     steps:
-      - name: Install deps
+      - name: Setup Persistent Directories
+        run: |
+          mkdir -p /opt/gbo/data/cache/sccache
+          mkdir -p /opt/gbo/data/cache/cargo
+          mkdir -p /opt/gbo/data/persistent-botserver
+          mkdir -p /opt/gbo/data/gb-ws
+          chmod -R 755 /opt/gbo/data/cache
+          chmod -R 755 /opt/gbo/data/persistent-botserver
+
+      - name: Setup Git
+        run: |
+          git config --global http.sslVerify false
+          git config --global --add safe.directory "*"
+
+      - name: Update Workspace (Incremental)
+        run: |
+          set -e
+          WORKSPACE="/opt/gbo/data/persistent-botserver"
+          cd $WORKSPACE
+          
+          if [ -d botlib/.git ]; then
+            echo "Updating botlib..."
+            git -C botlib fetch --depth 1 origin main
+            git -C botlib reset --hard origin/main
+          else
+            echo "Cloning botlib..."
+            git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/botlib.git botlib
+          fi
+          
+          if [ -d botserver/.git ]; then
+            echo "Updating botserver..."
+            git -C botserver fetch --depth 1 origin main
+            git -C botserver reset --hard origin/main
+          else
+            echo "Cloning botserver..."
+            git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/BotServer.git botserver
+          fi
+          
+          if [ -d /opt/gbo/data/gb-ws/.git ]; then
+            git -C /opt/gbo/data/gb-ws fetch --depth 1 origin main
+            git -C /opt/gbo/data/gb-ws reset --hard origin/main
+          else
+            git clone --depth 1 --branch main https://alm.pragmatismo.com.br/GeneralBots/gb.git /opt/gbo/data/gb-ws
+          fi
+          
+          cp /opt/gbo/data/gb-ws/Cargo.toml Cargo.toml
+          for m in botapp botdevice bottest botui botbook botmodels botplugin bottemplates; do
+            grep -v "\"$m\"" Cargo.toml > /tmp/c.toml && mv /tmp/c.toml Cargo.toml
+          done
+
+      - name: Install system dependencies
         run: |
           PKGS="libpq-dev libssl-dev liblzma-dev pkg-config"
+          MISSING=""
           for pkg in $PKGS; do
-            dpkg -s "$pkg" >/dev/null 2>&1 || apt-get install -y "$pkg"
+            dpkg -s "$pkg" >/dev/null 2>&1 || MISSING="$MISSING $pkg"
-          done || apt-get update && apt-get install -y $PKGS
+          done
+          if [ -n "$MISSING" ]; then
+            sudo apt-get update -qq -o Acquire::Retries=3 -o Acquire::http::Timeout=30
+            sudo apt-get install -y --no-install-recommends $MISSING
+          else
+            echo "All system dependencies already installed"
+          fi
 
-      - name: Clone
+      - name: Clean up old artifacts
         run: |
-          cd /tmp
+          find /opt/gbo/data/persistent-botserver/target -name "*.rlib" -type f -mtime +7 -delete 2>/dev/null || true
-          rm -rf botlib botserver gb-ws
-          git clone --depth 1 https://alm.pragmatismo.com.br/GeneralBots/botlib.git
-          git clone --depth 1 https://alm.pragmatismo.com.br/GeneralBots/BotServer.git botserver
-          git clone --depth 1 https://alm.pragmatismo.com.br/GeneralBots/gb.git gb-ws
 
-      - name: Build
+      - name: Build BotServer (Incremental)
-        working-directory: /tmp
+        working-directory: /opt/gbo/data/persistent-botserver
         run: |
-          export PATH="/home/gbuser/.cargo/bin:/home/gbuser/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin:$PATH"
+          sccache --start-server 2>/dev/null || true
-          cp gb-ws/Cargo.toml .
+          BOTSERVER_BUILD_DATE="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
-          sed -i '/botapp\|botdevice\|bottest\|botui\|botbook\|botmodels\|botplugin\|bottemplates/d' Cargo.toml
+          BOTSERVER_COMMIT="$(git -C botserver rev-parse --short HEAD 2>/dev/null || echo unknown)"
-          cargo build --package botserver
+          export BOTSERVER_BUILD_DATE
+          export BOTSERVER_COMMIT
+          echo "Build date: $BOTSERVER_BUILD_DATE"
+          echo "Commit: $BOTSERVER_COMMIT"
+          echo "Building incrementally with cache..."
+          cargo build -p botserver -j 8 2>&1
+          sccache --show-stats
+          ls -lh target/debug/botserver
 
-      - name: Deploy
+      - name: Save build log
+        if: always()
+        run: ls -lh /opt/gbo/data/persistent-botserver/target/debug/botserver 2>&1 || echo "Binary not found"
+
+      - name: Deploy via ssh tar gzip
+        run: |
+          set -e
+          SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=5 -o ServerAliveInterval=5 -o ServerAliveCountMax=2 -o BatchMode=yes"
+          echo "=== Deploy started ==="
+          echo "Step 1: Checking binary..."
+          ls -lh /opt/gbo/data/persistent-botserver/target/debug/botserver
+          echo "Step 2: Backing up old binary..."
+          ssh $SSH_ARGS system "cp /opt/gbo/bin/botserver /tmp/botserver.bak" || true
+          echo "Step 3: Stopping botserver..."
+          ssh $SSH_ARGS system "sudo systemctl stop botserver 2>/dev/null || true; sleep 2; killall -9 botserver 2>/dev/null || true; echo 'OK: botserver stopped'"
+          echo "Step 4: Transferring new binary..."
+          tar cf - -C /opt/gbo/data/persistent-botserver/target/debug botserver | gzip -1 | ssh $SSH_ARGS system "gzip -d | tar xf - -C /opt/gbo/bin && chmod +x /opt/gbo/bin/botserver && chown gbuser:gbuser /opt/gbo/bin/botserver && echo 'Transfer complete'"
+          echo "Step 5: Verifying binary..."
+          ssh $SSH_ARGS system "ls -la /opt/gbo/bin/botserver"
+          echo "Step 6: Starting botserver..."
+          ssh $SSH_ARGS system "sudo systemctl start botserver && echo 'Botserver started'"
+          echo "Step 7: Health check..."
+          ssh $SSH_ARGS system "for i in \$(seq 1 30); do curl -sf http://localhost:5858/api/health && echo && break; echo \"waiting (\$i/30)...\"; sleep 2; done"
+          echo "=== Deploy completed ==="
+
+      - name: Verify botserver started
         run: |
-          SSH="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no"
-          ssh $SSH system "sudo systemctl stop botserver || true"
-          scp $SSH /tmp/target/debug/botserver system:/tmp/botserver
-          ssh $SSH system "sudo mv /tmp/botserver /opt/gbo/bin/botserver && sudo chmod +x /opt/gbo/bin/botserver && sudo chown gbuser:gbuser /opt/gbo/bin/botserver"
-          ssh $SSH system "sudo systemctl start botserver"
           sleep 5
-          ssh $SSH system "curl -sf http://localhost:8080/api/health && echo 'Deploy OK'"
+          SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=5 -o ServerAliveInterval=5 -o ServerAliveCountMax=2 -o BatchMode=yes"
-
+          ssh $SSH_ARGS system "pgrep -f botserver >/dev/null && echo 'OK: botserver running' || echo 'WARNING: check status'"
-      - name: Verify
-        run: |
-          SSH="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no"
-          ssh $SSH system "pgrep -f botserver && echo 'BotServer running'"