Merge pull request #151

Sonar
sercheo87 · Jun 8, 2024 · 7509d2d · 7509d2d
2 parents 87faddd + 77fdb2d
commit 7509d2d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 37 deletions.
diff --git a/.github/workflows/npm-build.yml b/.github/workflows/npm-build.yml
@@ -18,21 +18,16 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
             -   uses: actions/setup-node@v2
                 with:
                     node-version: 20
             -   run: npm install
             -   run: npm run lint
             -   run: npm run test
-            -   name: Setup sonarqube
-                uses: warchant/setup-sonar-scanner@v3
-            -   name: Run sonarqube
+            -   name: SonarCloud Scan
+                uses: SonarSource/sonarcloud-github-action@master
                 env:
-                    GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
-                run: sonar-scanner
-                    -Dsonar.sources=.
-                    -Dsonar.exclusions=node_modules/**,sonar-scanner-3.3.0.1492-linux/**
-                    -Dsonar.login=${{ secrets.SONAR_TOKEN }}
-                    -Dsonar.host.url=https://sonarcloud.io
-                    -Dsonar.projectKey=convert-postman-jmeter
+                    GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}  # Needed to get PR information, if any
+                    SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -13,24 +13,18 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
             -   uses: actions/setup-node@v2
                 with:
                     node-version: 20
             -   run: npm install
             -   run: npm run lint
             -   run: npm run test
-            -   name: Setup sonarqube
-                uses: warchant/setup-sonar-scanner@v3
-            -   name: Run sonarqube
+            -   name: SonarCloud Scan
+                uses: SonarSource/sonarcloud-github-action@master
                 env:
-                    GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
-                run: sonar-scanner
-                    -Dsonar.sources=.
-                    -Dsonar.exclusions=node_modules/**,sonar-scanner-3.3.0.1492-linux/**
-                    -Dsonar.login=${{ secrets.SONAR_TOKEN }}
-                    -Dsonar.host.url=https://sonarcloud.io
-                    -Dsonar.projectKey=convert-postman-jmeter
+                    GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}  # Needed to get PR information, if any
+                    SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
     publish-npm:
         needs: build

diff --git a/.github/workflows/npm-release.yml b/.github/workflows/npm-release.yml
@@ -9,24 +9,18 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v3
             -   uses: actions/setup-node@v2
                 with:
                     node-version: 20
             -   run: npm install
             -   run: npm run lint
             -   run: npm run test
-            -   name: Setup sonarqube
-                uses: warchant/setup-sonar-scanner@v3
-            -   name: Run sonarqube
+            -   name: SonarCloud Scan
+                uses: SonarSource/sonarcloud-github-action@master
                 env:
-                    GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}
-                run: sonar-scanner
-                    -Dsonar.sources=.
-                    -Dsonar.exclusions=node_modules/**,sonar-scanner-3.3.0.1492-linux/**
-                    -Dsonar.login=${{ secrets.SONAR_TOKEN }}
-                    -Dsonar.host.url=https://sonarcloud.io
-                    -Dsonar.projectKey=convert-postman-jmeter
+                    GITHUB_TOKEN: ${{ secrets.GIT_TOKEN }}  # Needed to get PR information, if any
+                    SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
             -   name: Changelog
                 uses: scottbrenner/generate-changelog-action@master
                 id: Changelog

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,13 +1,11 @@
 # must be unique in a given SonarQube instance
-sonar.organization=sercheo87-github
-sonar.projectKey=convert-postman-jmeter
+sonar.projectKey=sercheo87_convert-postman-jmeter
+sonar.organization=sercheo87
 # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
 sonar.projectName=convert-postman-jmeter
 sonar.projectVersion=1.0.3
-
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 # This property is optional if sonar.modules is set. 
 sonar.sources=.
-
 # Encoding of the source code. Default is default system encoding
 sonar.sourceEncoding=UTF-8