From 21a7095279f57244be24f7d9c2a947c8397affce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D8=B4=D8=B1=D9=83=D8=A9=20=D8=AE=D8=A8=D9=8A=D8=B1=20?=
 =?UTF-8?q?=D8=A7=D9=84=D9=85=D8=AD=D8=AF=D9=88=D8=AF=D8=A9?=
 <it@exp-sa.com>
Date: Sat, 27 Sep 2025 22:46:19 +0300
Subject: [PATCH] Update github action file

---
 .github/workflows/sonarqube.yml | 68 ++++-----------------------------
 1 file changed, 8 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index beff54124..9a5223bbe 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -25,23 +25,15 @@ on:
       - master_odex25_ensan
       - master_odex25_donation
 
-  pull_request:
-    branches:
-      - "**"
-
-  pull_request_target:
-    types: [closed]
 
 jobs:
-  # ========= Branch Analysis =========
-  sonar-branches:
-    if: github.event_name == 'push'
+  sonar:
     runs-on: sonarqube
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run SonarScanner for Branch
+      - name: Run SonarScanner
         run: |
           export BRANCH_NAME="${GITHUB_REF#refs/heads/}"
           export SAFE_BRANCH_NAME="${BRANCH_NAME//\//_}"
@@ -51,63 +43,19 @@ jobs:
           export PROJECT_VERSION="1.0"
           export SONAR_HOST_URL=${{ secrets.SONAR_HOST_URL }}
           export SONAR_TOKEN=${{ secrets.SONAR_TOKEN }}
-
+          
           sonar-scanner \
             -Dsonar.projectKey="$PROJECT_KEY" \
             -Dsonar.projectName="$PROJECT_NAME" \
             -Dsonar.projectVersion="$PROJECT_VERSION" \
             -Dsonar.sources="$SOURCE_FOLDER_NAME" \
-            -Dsonar.inclusions="**/*.py,**/*.xml,**/*.js,**/*.html,**/*.css" \
-            -Dsonar.exclusions="**/__manifest__.py,**/migrations/**,**/__pycache__/**" \
+            -Dsonar.inclusions="**/*.py, **/*.xml, **/*.js, **/*.html, **/*.css" \
+            -Dsonar.exclusions="**/__manifest__.py, **/migrations/**, **/__pycache__/**" \
             -Dsonar.sourceEncoding="UTF-8" \
             -Dsonar.host.url="$SONAR_HOST_URL" \
             -Dsonar.login="$SONAR_TOKEN"
 
-  # ========= PR Analysis =========
-  sonar-prs:
-    if: github.event_name == 'pull_request'
-    runs-on: sonarqube
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Run SonarScanner for PR
+      - name: Cleanup workspace
+        if: always()
         run: |
-          BRANCH_NAME="${GITHUB_HEAD_REF}"
-          BASE_BRANCH="${GITHUB_BASE_REF}"
-          PR_KEY="${{ github.event.pull_request.number }}"
-
-          SONAR_HOST_URL=${{ secrets.SONAR_HOST_URL }}
-          SONAR_TOKEN=${{ secrets.SONAR_TOKEN }}
-
-          echo "🔎 Running SonarQube analysis for PR #$PR_KEY ($BRANCH_NAME -> $BASE_BRANCH)"
-
-          sonar-scanner \
-            -Dsonar.projectKey="odex25_standard_modules_prs" \
-            -Dsonar.projectName="Odex25 Standard Modules - PRs" \
-            -Dsonar.sources=. \
-            -Dsonar.inclusions=**/*.py,**/*.xml,**/*.js,**/*.html,**/*.css \
-            -Dsonar.exclusions=**/__manifest__.py,**/migrations/**,**/__pycache__/** \
-            -Dsonar.sourceEncoding=UTF-8 \
-            -Dsonar.host.url=$SONAR_HOST_URL \
-            -Dsonar.token=$SONAR_TOKEN \
-            -Dsonar.branch.name="pr-$PR_KEY-$BRANCH_NAME"
-
-  # # ========= Cleanup Closed PRs =========
-  # sonar-prs-cleanup:
-  #   if: github.event_name == 'pull_request_target' && github.event.action == 'closed'
-  #   runs-on: sonarqube
-  #   steps:
-  #     - name: Delete PR branch from SonarQube
-  #       run: |
-  #         PR_KEY="${{ github.event.pull_request.number }}"
-  #         BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
-  #         SONAR_HOST_URL=${{ secrets.SONAR_HOST_URL }}
-  #         SONAR_TOKEN=${{ secrets.SONAR_TOKEN }}
-
-  #         echo "🧹 Cleaning up SonarQube branch for PR #$PR_KEY ($BRANCH_NAME)"
-
-  #         curl -u "$SONAR_TOKEN:" -X POST \
-  #           "$SONAR_HOST_URL/api/project_branches/delete?project=odex25_standard_modules_prs&branch=pr-$PR_KEY-$BRANCH_NAME"
+          rm -rf $GITHUB_WORKSPACE/*