Fix GitHub actions

Author: byteful

.github/workflows/deploy-staging.yml

@@ -27,36 +27,29 @@ jobs:
 
       - name: Deploy via SSH
         run: |
-          ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.STAGING_IP }} "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" << 'EOF'
-            set -e
-            
-            cd /home/modl/modl-admin
-            
-            git stash
-            
-            git pull origin dev
-            
-            if git diff --name-only HEAD@{1} HEAD | grep -q "^package.*\.json$"; then
-              npm ci
-            fi
-            
-            if git diff --name-only HEAD@{1} HEAD | grep -q "^client/package.*\.json$"; then
-              cd client
-              npm ci
-              cd ..
-            fi
-            
-            npm run build
-            
-            pm2 reload modl-admin --wait-ready
-            
-            if pm2 describe modl-admin | grep -q "online"; then
-              echo "PM2 process is running successfully"
-            else
-              echo "Error: PM2 process failed to start"
-              exit 1
-            fi
-          EOF
+          ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.STAGING_IP }} '
+          set -e
+          export GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}"
+          cd /home/modl/modl-admin
+          git stash
+          git pull origin dev
+          if git diff --name-only HEAD@{1} HEAD | grep -q "^package.*\.json$"; then
+            npm ci
+          fi
+          if git diff --name-only HEAD@{1} HEAD | grep -q "^client/package.*\.json$"; then
+            cd client
+            npm ci
+            cd ..
+          fi
+          npm run build
+          pm2 reload modl-admin --wait-ready
+          if pm2 describe modl-admin | grep -q "online"; then
+            echo "PM2 process is running successfully"
+          else
+            echo "Error: PM2 process failed to start"
+            exit 1
+          fi
+          '
 
       - name: Notify on failure
         if: failure()

.github/workflows/deploy.yml

@@ -27,36 +27,29 @@ jobs:
 
       - name: Deploy via SSH
         run: |
-          ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }} "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" << 'EOF'
-            set -e
-            
-            cd /home/modl/modl-admin
-            
-            git stash
-            
-            git pull origin main
-            
-            if git diff --name-only HEAD@{1} HEAD | grep -q "^package.*\.json$"; then
-              npm ci
-            fi
-            
-            if git diff --name-only HEAD@{1} HEAD | grep -q "^client/package.*\.json$"; then
-              cd client
-              npm ci
-              cd ..
-            fi
-            
-            npm run build
-            
-            pm2 reload modl-admin --wait-ready
-            
-            if pm2 describe modl-admin | grep -q "online"; then
-              echo "PM2 process is running successfully"
-            else
-              echo "Error: PM2 process failed to start"
-              exit 1
-            fi
-          EOF
+          ssh -o StrictHostKeyChecking=no ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }} '
+          set -e
+          export GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}"
+          cd /home/modl/modl-admin
+          git stash
+          git pull origin main
+          if git diff --name-only HEAD@{1} HEAD | grep -q "^package.*\.json$"; then
+            npm ci
+          fi
+          if git diff --name-only HEAD@{1} HEAD | grep -q "^client/package.*\.json$"; then
+            cd client
+            npm ci
+            cd ..
+          fi
+          npm run build
+          pm2 reload modl-admin --wait-ready
+          if pm2 describe modl-admin | grep -q "online"; then
+            echo "PM2 process is running successfully"
+          else
+            echo "Error: PM2 process failed to start"
+            exit 1
+          fi
+          '
 
       - name: Notify on failure
         if: failure()