Optimize SSH connections and add caching for GitHub Actions deployment

Author: ralyodio

.deployignore

@@ -1,3 +1,32 @@
+# Dependencies
 node_modules/
+.pnpm-store/
+
+# Version control
+.git/
+.github/
+.gitignore
+
+# Logs and temporary files
 *.log
-.DS_Store
+.DS_Store
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Development files
+.vscode/
+.idea/
+*.md
+!README.md
+*.test.js
+tests/
+test/
+
+# Environment files (handled separately in workflow)
+.env*
+!.env.example
+
+# Other unnecessary files
+*.tmp
+*.bak

.github/workflows/deploy.yml

@@ -12,65 +12,68 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
+      
+      # Cache SSH configuration
+      - name: Cache SSH configuration
+        uses: actions/cache@v3
+        id: ssh-cache
+        with:
+          path: ~/.ssh
+          key: ssh-config-${{ runner.os }}-v1
 
       - name: Set up SSH
         uses: webfactory/[email protected]
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
       - name: Add server to known hosts
+        if: steps.ssh-cache.outputs.cache-hit != 'true'
         run: |
           mkdir -p ~/.ssh
           
           # Create SSH config file with custom port and user
-          echo "Creating SSH config file..."
           cat > ~/.ssh/config << EOF
           Host profullstack.com 104.36.23.197
             HostName 104.36.23.197
             User ubuntu
             Port 2048
+            ControlMaster auto
+            ControlPath ~/.ssh/control-%C
+            ControlPersist 30s
           EOF
           chmod 600 ~/.ssh/config
           
           # Run ssh-keyscan with the correct port
-          echo "Running ssh-keyscan with custom port..."
-          # The -p flag is for the port, -T disables pseudo-terminal allocation
           ssh-keyscan -p 2048 -T 60 104.36.23.197 > /tmp/known_hosts_entry
           
           # Check if ssh-keyscan succeeded
           if [ -s /tmp/known_hosts_entry ]; then
-            echo "Successfully retrieved host key:"
-            cat /tmp/known_hosts_entry
-            
-            # Add the host key to known_hosts
             cat /tmp/known_hosts_entry >> ~/.ssh/known_hosts
             chmod 644 ~/.ssh/known_hosts
           else
-            echo "Failed to retrieve host key via ssh-keyscan, using provided key..."
             echo "${{ secrets.SERVER_KNOWN_HOSTS }}" > ~/.ssh/known_hosts
             chmod 644 ~/.ssh/known_hosts
           fi
-          
-          # Verify the files exist and have content
-          ls -la ~/.ssh/
-          echo "Content of SSH config:"
-          cat ~/.ssh/config
-          echo "Lines in known_hosts:"
-          wc -l ~/.ssh/known_hosts
+      
+      # Cache apt packages
+      - name: Cache apt packages
+        uses: actions/cache@v3
+        id: apt-cache
+        with:
+          path: /var/cache/apt/archives
+          key: apt-packages-${{ runner.os }}-${{ hashFiles('.github/workflows/deploy.yml') }}
 
       - name: Install dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install -y rsync zsh curl file golang postgresql-client gnome-keyring dbus-x11
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends rsync zsh curl file golang postgresql-client gnome-keyring dbus-x11
           
           # Set up dbus for gnome-keyring
-          echo "Setting up dbus and gnome-keyring..."
           mkdir -p ~/.cache
           dbus-launch --sh-syntax > ~/.cache/dbus-env
           source ~/.cache/dbus-env
           
           # Initialize the keyring
-          echo "Initializing gnome-keyring..."
           echo -n "password" | gnome-keyring-daemon --unlock
           
           # Export environment variables for subsequent steps
@@ -80,8 +83,6 @@ jobs:
         run: |
           # Create .env file from GitHub secret
           echo "${{ secrets.ENV_FILE_CONTENT }}" > .env
-          
-          # Print confirmation (without showing the content for security)
           echo "Created .env file with $(grep -c '' .env) lines"
           
       - name: Prepare for deployment
@@ -90,28 +91,14 @@ jobs:
           chmod +x ./bin/supabase-db.sh
           chmod +x ./bin/deploy.sh
           chmod +x ./bin/deploy-with-migrations.sh
-          
-          # Debug: Check .env file existence
-          echo "Checking .env file..."
-          if [ -f .env ]; then
-            echo ".env file exists with $(grep -c '' .env) lines"
-          else
-            echo ".env file does not exist"
-          fi
       
       - name: Deploy to server with migrations
         run: |
-          # Print debug info
-          echo "Current directory: $(pwd)"
-          echo "Files in bin directory:"
-          ls -la ./bin
-          
           # Run deploy script with migrations
           ./bin/deploy-with-migrations.sh
           
           # Run test script to verify deployment
-          echo "Running test script on remote server..."
-          ssh -p 2048 [email protected] "cd $DEPLOY_REMOTE_DIR && chmod +x bin/test-github-actions.sh && ./bin/test-github-actions.sh"
+          ssh -p 2048 -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s [email protected] "cd $DEPLOY_REMOTE_DIR && chmod +x bin/test-github-actions.sh && ./bin/test-github-actions.sh"
         env:
           DEPLOY_REMOTE_HOST: 104.36.23.197
           DEPLOY_REMOTE_PORT: 2048

bin/deploy-with-migrations.sh

@@ -23,8 +23,8 @@ REMOTE_PORT="${DEPLOY_REMOTE_PORT:-2048}"
 REMOTE_USER="${DEPLOY_REMOTE_USER:-ubuntu}"
 REMOTE_DIR="${DEPLOY_REMOTE_DIR:-www/profullstack.com/pdf}"
 
-# Create SSH options
-SSH_OPTS="-p $REMOTE_PORT"
+# Create SSH options with connection reuse
+SSH_OPTS="-p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s"
 
 # Deploy the code first using deploy.sh
 echo -e "${YELLOW}Running deployment script...${NC}"

bin/deploy.sh

@@ -16,10 +16,10 @@ REMOTE_DIR="${DEPLOY_REMOTE_DIR:-www/profullstack.com/pdf}"
 LOCAL_DIR="."
 INSTALL_SERVICE="${INSTALL_SERVICE:-false}"
 
-# Create SSH options
-SSH_OPTS="-p $REMOTE_PORT"
+# Create SSH options with connection reuse
+SSH_OPTS="-p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s"
 SCP_OPTS="-P $REMOTE_PORT"
-RSYNC_OPTS="-e \"ssh -p $REMOTE_PORT\""
+RSYNC_OPTS="-e \"ssh -p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s\""
 
 # Set colors for output
 GREEN='\033[0;32m'
@@ -42,10 +42,10 @@ if ssh $SSH_OPTS $REMOTE_USER@$REMOTE_HOST "[ -d $REMOTE_DIR ]"; then
     # Deploy using rsync with .deployignore
     if [ -f .deployignore ]; then
         echo -e "${YELLOW}Using .deployignore file for exclusions...${NC}"
-        rsync -avz --partial --progress -e "ssh -p $REMOTE_PORT" --exclude-from=.deployignore $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
+        rsync -avz --partial --compress-level=9 --delete -e "ssh -p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s" --exclude-from=.deployignore $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
     else
         echo -e "${YELLOW}No .deployignore file found. Excluding node_modules/ by default...${NC}"
-        rsync -avz --partial --progress -e "ssh -p $REMOTE_PORT" --exclude="node_modules/" $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
+        rsync -avz --partial --compress-level=9 --delete -e "ssh -p $REMOTE_PORT -o ControlMaster=auto -o ControlPath=~/.ssh/control-%C -o ControlPersist=30s" --exclude="node_modules/" $LOCAL_DIR $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR
     fi
 
     # Check if rsync was successful