Concatenate sonarcloud additional parameters to be one command string

Signed-off-by: Anton Fedurtsya <[email protected]>
OXID-eSales · Dec 10, 2024 · 887084c · 887084c
1 parent 6a55aa2
commit 887084c
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 34 deletions.
diff --git a/.github/oxid-esales/defaults/defaults.yaml b/.github/oxid-esales/defaults/defaults.yaml
@@ -594,19 +594,19 @@ sonarcloud:
   project_name: 'oxideshop_ce'
   # Parameters passed to the scanner
   parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=source
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=source \
     -Dsonar.tests=tests
 
   # DEPRECATED: (we use a separate config for this now) for the internal run, leave the project key empty if you don't have a need
   # for this second run with different settings
   internal_project_key: 'OXID-eSales_oxideshop_ce_internal'
   internal_project_name: 'oxideshop_ce_internal'
   internal_parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=source/Internal
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=source/Internal \
     -Dsonar.tests=tests
 
 # See docs/actions/start_shop.md and docs/actions/phpcs.md for more information.

diff --git a/.github/oxid-esales/defaults/defaults.yml b/.github/oxid-esales/defaults/defaults.yml
@@ -594,19 +594,19 @@ sonarcloud:
   project_name: 'oxideshop_ce'
   # Parameters passed to the scanner
   parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=source
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=source \
     -Dsonar.tests=tests
 
   # DEPRECATED: (we use a separate config for this now) for the internal run, leave the project key empty if you don't have a need
   # for this second run with different settings
   internal_project_key: 'OXID-eSales_oxideshop_ce_internal'
   internal_project_name: 'oxideshop_ce_internal'
   internal_parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=source/Internal
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=source/Internal \
     -Dsonar.tests=tests
 
 # See docs/actions/start_shop.md and docs/actions/phpcs.md for more information.

diff --git a/.github/oxid-esales/defaults/defaults_light.yaml b/.github/oxid-esales/defaults/defaults_light.yaml
@@ -393,9 +393,9 @@ sonarcloud:
   project_name: 'oxideshop_ce'
   # Parameters passed to the scanner
   parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=source
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=source \
     -Dsonar.tests=tests
 
 # yamllint validates the github actions/testplan yaml files

diff --git a/.github/oxid-esales/defaults/defaults_light.yml b/.github/oxid-esales/defaults/defaults_light.yml
@@ -393,9 +393,9 @@ sonarcloud:
   project_name: 'oxideshop_ce'
   # Parameters passed to the scanner
   parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=source
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=source \
     -Dsonar.tests=tests
 
 # yamllint validates the github actions/testplan yaml files

diff --git a/.github/oxid-esales/defaults/module.yaml b/.github/oxid-esales/defaults/module.yaml
@@ -37,9 +37,9 @@ runslim:
 sonarcloud:
   strip_path: '/var/www/vendor/{{ .Data.global.org}}/{{ .Data.global.name }}/'
   parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=src
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=src \
     -Dsonar.tests=tests
 
 finish:

diff --git a/.github/oxid-esales/defaults/module.yml b/.github/oxid-esales/defaults/module.yml
@@ -37,9 +37,9 @@ runslim:
 sonarcloud:
   strip_path: '/var/www/vendor/{{ .Data.global.org}}/{{ .Data.global.name }}/'
   parameters: |
-    -Dsonar.language=php
-    -Dsonar.scm.provider=git
-    -Dsonar.sources=src
+    -Dsonar.language=php \
+    -Dsonar.scm.provider=git \
+    -Dsonar.sources=src \
     -Dsonar.tests=tests
 
 finish:

diff --git a/docs/actions/sonarcloud.md b/docs/actions/sonarcloud.md
@@ -33,12 +33,12 @@ Project key in sonarcloud.
 Project name in sonarcloud.
 
 **sonarcloud_parameters:** *not required*, *default:*  
-    - -Dsonar.language=php
-    - -Dsonar.sources=source
-    - -Dsonar.tests=tests
-    - -Dsonar.sourceEncoding=UTF-8
-    - -Dsonar.php.coverage.reportPaths=tests/coverage.xml
-    - -Dsonar.cpd.php.minimumTokens=25
+    - -Dsonar.language=php \
+    - -Dsonar.sources=source \
+    - -Dsonar.tests=tests \
+    - -Dsonar.sourceEncoding=UTF-8 \
+    - -Dsonar.php.coverage.reportPaths=tests/coverage.xml \
+    - -Dsonar.cpd.php.minimumTokens=25 \
     - -Dsonar.cpd.php.minimumLines=5  
 Parameters passed to the scanner.
 

diff --git a/sonarcloud/action.yaml b/sonarcloud/action.yaml
@@ -40,10 +40,10 @@ inputs:
     required: false
     description: 'Parameters passed to the scanner'
     default: |
-      -Dsonar.language=php
-      -Dsonar.sources=source
-      -Dsonar.tests=tests
-      -Dsonar.cpd.php.minimumTokens=25
+      -Dsonar.language=php \
+      -Dsonar.sources=source \
+      -Dsonar.tests=tests \
+      -Dsonar.cpd.php.minimumTokens=25 \
       -Dsonar.cpd.php.minimumLines=5
   sonar_token:
     type: string