From 1d51bb429d9ee9081c86c1f204a57aba3fcd0b51 Mon Sep 17 00:00:00 2001
From: Rajendra Reddy <rajendra@wdipl.com>
Date: Wed, 24 Dec 2025 19:07:24 +0000
Subject: [PATCH] v2

---
 .gitea/workflows/deploy.yml | 76 +++++++++++++++++++++++++------------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 39d28f4..4fb7016 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,33 +1,76 @@
-
 name: Test Gitea Actions Workflow
 
 on:
   push:
     branches:
+      - beta
+      - testing
+      - staging
+      - production
+
+  pull_request:
+    branches:
+      - main
       - beta
       - testing
       - client
       - staging
       - production
+
 jobs:
-  react_deploy:
+
+  build_test:
+    name: Build and Test PR
+    if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout code
+      - name: Checkout Code
         uses: actions/checkout@v3
 
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install Dependencies
+        run: npm i --legacy-peer-deps
+
+      - name: Check Build
+        run: npm run build
+
+      - name: Audit Node Dependencies
+        run: npm audit --audit-level=critical
+
+      - name: Checkout Code (Full History)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: SonarQube Scan
+        uses: kitabisa/sonarqube-action@v1.2.0
+        with:
+          host: ${{ secrets.SONARQUBE_HOST }}
+          login: ${{ secrets.SONARQUBE_TOKEN }}
+
+  react_deploy:
+    name: Deploy React App
+    if: github.event_name == 'push'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
 
       # --------------------------------------------------------
-      # 2. Determine SSH Host &  Deployment Folder Based on Branch
+      # Determine SSH Host & Deployment Folder Based on Branch
       # --------------------------------------------------------
-
       - name: Determine SSH & Deployment Path
         run: |
           echo "Detected branch: ${{ gitea.ref_name }}"
           BRANCH_NAME="${{ gitea.ref_name }}"
 
           case "$BRANCH_NAME" in
-
             beta)
               echo "DEPLOY_HOST=${{ vars.BETA_SERVER_HOST }}" >> $GITEA_ENV
               echo "DEPLOY_USER=${{ vars.BETA_SERVER_USER }}" >> $GITEA_ENV
@@ -37,16 +80,7 @@ jobs:
               PROJECT_PATH="/home/deployauto/Sprint_Release"
               ;;
 
-            testing)
-              echo "DEPLOY_HOST=${{ vars.BETA_SERVER_HOST }}" >> $GITEA_ENV
-              echo "DEPLOY_USER=${{ vars.BETA_SERVER_USER }}" >> $GITEA_ENV
-              echo "DEPLOY_PASS=${{ secrets.BETA_SERVER_PASSWORD }}" >> $GITEA_ENV
-              echo "DEPLOY_PORT=${{ secrets.BETA_SERVER_PORT }}" >> $GITEA_ENV
-              echo "AUTH_TYPE=password" >> $GITEA_ENV
-              PROJECT_PATH="null"
-              ;;
-
-            client)
+            testing|client)
               echo "DEPLOY_HOST=${{ vars.BETA_SERVER_HOST }}" >> $GITEA_ENV
               echo "DEPLOY_USER=${{ vars.BETA_SERVER_USER }}" >> $GITEA_ENV
               echo "DEPLOY_PASS=${{ secrets.BETA_SERVER_PASSWORD }}" >> $GITEA_ENV
@@ -76,13 +110,11 @@ jobs:
             *)
               echo "Unknown branch: $BRANCH_NAME"
               exit 1
+              ;;
           esac
 
           echo "PROJECT_PATH=$PROJECT_PATH" >> $GITEA_ENV
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITEA_ENV
-          echo "Selected PROJECT_PATH: $PROJECT_PATH"
-          echo "DEPLOY_HOST: $DEPLOY_HOST"
-          echo "DEPLOY_USER: $DEPLOY_USER" 
 
       - name: Deploy via Password Auth
         if: env.AUTH_TYPE == 'password'
@@ -97,8 +129,6 @@ jobs:
           port: ${{ env.DEPLOY_PORT }}
           envs: PROJECT_PATH,BRANCH_NAME
           script: |
-            echo "Incoming Branch : $BRANCH_NAME"
-            echo "Selected folder = $PROJECT_PATH"
             cd "$PROJECT_PATH/reactautodeploy"
             git pull origin $BRANCH_NAME
             npm i && npm run build
@@ -116,10 +146,6 @@ jobs:
           port: ${{ env.DEPLOY_PORT }}
           envs: PROJECT_PATH,BRANCH_NAME
           script: |
-            echo "Incoming Branch : $BRANCH_NAME"
-            echo "Selected folder = $PROJECT_PATH"
             cd "$PROJECT_PATH/reactautodeploy"
             git pull origin $BRANCH_NAME
             npm i && npm run build
-
-