From a1ed38fa65bb25e4aac80739f783e5496f17d804 Mon Sep 17 00:00:00 2001
From: CvH <109217179+0xCVH@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:28:55 +0100
Subject: [PATCH 1/2] Update and rename sonarqube.yml to sonarcloud.yml

---
 .github/workflows/sonarcloud.yml | 21 +++++++++++++++++++++
 .github/workflows/sonarqube.yml  | 22 ----------------------
 2 files changed, 21 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/sonarcloud.yml
 delete mode 100644 .github/workflows/sonarqube.yml

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
new file mode 100644
index 0000000000..5ad64db124
--- /dev/null
+++ b/.github/workflows/sonarcloud.yml
@@ -0,0 +1,21 @@
+name: SonarQube analysis
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  sonarcloud:
+    name: SonarCloud
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
deleted file mode 100644
index 30c260dbd9..0000000000
--- a/.github/workflows/sonarqube.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: SonarQube analysis
-
-on:
-  push:
-    branches:
-      - develop
-
-jobs:
-  sonarqube:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        # Disabling shallow clone is recommended for improving relevancy of reporting.
-        fetch-depth: 0
-
-    # Triggering SonarQube analysis as results of it are required by Quality Gate check.
-    - name: SonarQube Scan
-      uses: sonarsource/sonarqube-scan-action@master
-      env:
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}

From b56542923e4ba9fb2293626242cef345280a9a7d Mon Sep 17 00:00:00 2001
From: CvH <109217179+0xCVH@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:29:40 +0100
Subject: [PATCH 2/2] Update sonar-project.properties

---
 sonar-project.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sonar-project.properties b/sonar-project.properties
index 6ddc88abf2..5be950d99b 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1 +1,2 @@
-sonar.projectKey=zkevm-node
+sonar.projectKey=0xPolygon_cdk-validium-node
+sonar.organization=0xpolygon