Enhance deployment script to sync infrastructure files and improve service management

- Updated deploy.sh to sync systemd unit and Caddyfile if changes are detected, ensuring the latest configurations are applied.
- Added support for forced restarts with a --force option.
- Improved pip installation command for desktop dependencies and added no-cache option for efficiency.
- Enhanced service restart logic for environnets-xpra to ensure it picks up new code after deployment.

Author: DevAmby

.github/workflows/deploy.yml

@@ -0,0 +1,27 @@
+name: Deploy sandbox to VM
+
+on:
+  push:
+    branches:
+      - desktop-app
+  workflow_dispatch:
+
+concurrency:
+  group: deploy-sandbox
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH and run deploy.sh
+        uses: appleboy/ssh-action@v1.2.0
+        with:
+          host: ${{ secrets.DEPLOY_HOST }}
+          username: ubuntu
+          key: ${{ secrets.DEPLOY_SSH_KEY }}
+          port: 22
+          script_stop: true
+          script: |
+            cd ~/environnet-sim
+            bash deploy/deploy.sh

deploy/deploy.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-# Pull latest, reinstall deps if needed, restart sandbox service.
-# Idempotent. Run on the VM.
+# Pull latest, sync infra files if changed, restart sandbox service.
+# Idempotent. Run on the VM (or by GitHub Actions over SSH).
 set -euo pipefail
 
 APP_DIR="${APP_DIR:-$HOME/environnet-sim}"
@@ -12,15 +12,36 @@ REMOTE=$(git rev-parse '@{u}')
 
 if [[ "$LOCAL" == "$REMOTE" ]]; then
     echo "Already up to date ($LOCAL)"
-    exit 0
+    # Still allow forced restart with --force
+    if [[ "${1:-}" != "--force" ]]; then
+        exit 0
+    fi
 fi
 
 echo "==> Pulling $LOCAL -> $REMOTE"
 git pull --ff-only
 
 source .venv/bin/activate
-pip install -e ".[web]" --quiet
+pip install -e ".[desktop]" --quiet --no-cache-dir || \
+    pip install -e ".[desktop]" --no-cache-dir
 
-sudo systemctl restart environnets-web
-echo "==> Restarted. Status:"
-systemctl --no-pager status environnets-web --lines=3
+# Sync systemd unit if changed
+if ! sudo diff -q deploy/environnets-xpra.service /etc/systemd/system/environnets-xpra.service >/dev/null 2>&1; then
+    echo "==> systemd unit changed, updating"
+    sudo cp deploy/environnets-xpra.service /etc/systemd/system/environnets-xpra.service
+    sudo systemctl daemon-reload
+fi
+
+# Sync Caddyfile if changed
+if ! sudo diff -q deploy/Caddyfile.prod /etc/caddy/Caddyfile >/dev/null 2>&1; then
+    echo "==> Caddyfile changed, updating + reloading Caddy"
+    sudo cp deploy/Caddyfile.prod /etc/caddy/Caddyfile
+    sudo systemctl reload caddy
+fi
+
+# Restart sandbox so it picks up new code
+echo "==> Restarting environnets-xpra"
+sudo systemctl restart environnets-xpra
+sleep 4
+systemctl --no-pager status environnets-xpra --lines=3
+echo "==> Deploy complete."