cd: Fix broken workflow

Author: devadathanmb

.github/workflows/prod-deploy.yml

@@ -10,9 +10,10 @@ on:
       - "prod"
 
 jobs:
-  deploy:
+  prod_deploy:
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion == 'success'
+    if: github.event.workflow_run.conclusion == 'success' || github.event_name == 'push'
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -23,19 +24,47 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Pull and Deploy
-        run: |
-          docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ktu-bot:${{ github.sha }}
-          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/ktu-bot:${{ github.sha }} ktu-bot:latest
-          docker stop ktu-bot || true
-          docker rm ktu-bot || true
-          docker run -d --restart always \
-            -p 5000:5000 \
-            -e TZ=Asia/Kolkata \
-            -e ENV_TYPE=${{ secrets.ENV_TYPE }} \
-            -e ADMIN_ID=${{ secrets.ADMIN_ID }} \
-            -e BOT_TOKEN=${{ secrets.BOT_TOKEN }} \
-            -e FIREBASE_SERVICE_ACCOUNT="${{ secrets.FIREBASE_SERVICE_ACCOUNT }}" \
-            -e HUGGING_FACE_TOKEN="${{ secrets.HUGGING_FACE_TOKEN }}" \
-            -e FIREBASE_STORAGE_BUCKET="${{ secrets.FIREBASE_STORAGE_BUCKET }}" \
-            --name ktu-bot ktu-bot:latest
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ktu-bot:${{ github.sha }}
+
+      - name: Deploy to VPS
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          port: 22
+          script: |
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/ktu-bot:${{ github.sha }}
+            docker tag ${{ secrets.DOCKERHUB_USERNAME }}/ktu-bot:${{ github.sha }} ktu-bot:latest
+            docker stop ktu-bot || true
+            docker stop redis-queue-db || true
+            docker rm ktu-bot || true
+            docker rm redis-queue-db || true
+            docker network rm ktu-bot-network || true
+            docker network create ktu-bot-network || true
+            docker run -d --restart always -p 6379:6379 --network ktu-bot-network --network-alias redis-queue-db --name redis-queue-db redis
+            docker run -d \
+              --restart always \
+              -p 5000:5000 \
+              -e TZ=Asia/Kolkata \
+              --network ktu-bot-network \
+              -e ENV_TYPE=${{ secrets.ENV_TYPE }} \
+              -e ADMIN_ID=${{ secrets.ADMIN_ID }} \
+              -e WEBHOOK_DOMAIN=${{ secrets.WEBHOOK_DOMAIN }} \
+              -e WEBHOOK_PORT=${{ secrets.WEBHOOK_PORT }} \
+              -e BOT_TOKEN=${{ secrets.BOT_TOKEN }} \
+              -e FIREBASE_SERVICE_ACCOUNT="${{ secrets.FIREBASE_SERVICE_ACCOUNT }}" \
+              -e NODE_ENV=production \
+              -e HUGGING_FACE_TOKEN="${{ secrets.HUGGING_FACE_TOKEN }}" \
+              -e FIREBASE_STORAGE_BUCKET="${{ secrets.FIREBASE_STORAGE_BUCKET }}" \
+              -e LATEST_COMMIT=${{ github.sha }} \
+              -e UPTIME_ROBOT_API_KEY=${{ secrets.UPTIME_ROBOT_API_KEY }} \
+              -e ORIGIN_URL=${{ secrets.ORIGIN_URL }} \
+              --name ktu-bot \
+              -v /var/log/ktu-bot:/var/log/ktu-bot \
+              ktu-bot:latest

.github/workflows/test-deploy.yml

@@ -8,11 +8,14 @@ on:
   push:
     branches:
       - "prod"
+  pull_request:
+    branches:
+      - "prod"
 
 jobs:
   test_deploy:
     runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion == 'success'
+    if: github.event.workflow_run.conclusion == 'success' || github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'prod')
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -45,3 +48,4 @@ jobs:
             echo "Container has failed"
             exit 1
           fi
+