From bd84ac28ad8dfb3bd27184cf8dbf312f3a0fe97c Mon Sep 17 00:00:00 2001 From: Pavel Lobashov Date: Fri, 3 Nov 2017 14:11:08 +0300 Subject: [PATCH] Explictly call `sonar-scanner` bin, instead of travis own (#221) --- .travis.yml | 15 +++++++-------- sonar-project.properties | 3 ++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e704abe08..efc4a1ec43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,18 +6,14 @@ node_js: - '6' before_script: - git clone -b develop https://github.com/ONLYOFFICE/web-apps.git ../web-apps -addons: - sonarcloud: - organization: "onlyoffice" - token: - secure: "v/VxlPNCV70ugPc873YY5AETeMiHHcln5QUUP3WikYoZWHQQuUkAfUwvRIwRS+hgtopxjUJzywDkIZhX2w0VjCP0UxYjSXM84X3FzYsJx0H/cyOo2eDxMDfiZMQ2fQ7WACD6MPpwDMQLnGqZGtBj5IxjF3ah9APARBH2OwUJSYHlrH1Mb038xAFcs6Qyo3M+P80OgyuNbjpJ6PaKm5tsnAMXIYNuAg934DdlwIR05Jrt59LulYsPD7nFP/Zb10Vs4aY6UYhf+TQRyi/wHVnmL2b93KjBCrVqh2AC5oKU5n0Yqxshf5lcYebddtVJjNdKmEFxvKL4Z9f3GZIa5RNM0EkbN3eH3VP2+2kK/HQXurpuBk+uRxOL/ZXpwbVcAA5BG3NPlBVNFjE3Sg3GpOXNOVALjZZI1l/GlwCUERYeuPVaK8PxuE2DJBYoQLx6D2JiRLGlKGyBUOEmrGU13drdeQR6HNsulYYTz4woPMoF55tUT1JMNat53BP4evQvwnaTZvbMYGKjvGwu9c1Q85St6ozhVL2jAHFeL5FAriSTsGKHWMEHqYUL01ofFjTVwSLj9zlO4LyXzUpOnuJ/QLW7wLBtK9dJiJcqVJVdnZAcxo8H47As07+utVim3k33TTfJTTNY0Q1ZaOyYWzXvIEB7cDiYOunxXfMpInyTQ6XYxKQ=" - branches: - - develop jobs: include: - stage: SonarQube Scanner + if: branch = develop script: - - sonar-scanner + - wget -P /tmp https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.0.3.778-linux.zip + - unzip -d /tmp /tmp/sonar-scanner-cli-3.0.3.778-linux.zip + - /tmp/sonar-scanner-3.0.3.778-linux/bin/sonar-scanner -Dsonar.login=$SONAR_TOKEN - stage: Formulas tests script: - npm install -g node-qunit-phantomjs @@ -38,3 +34,6 @@ notifications: - shockwavenn@gmail.com on_success: never on_failure: always +env: + global: + secure: iqrqqfJLJkd9KRzYxP/Zt6KQqcMhnLavYhuYmkWdZS2+HLda4x40eI9v+ub0InetPnu2avfQl3K04FGhCEhDar+olmK1rZdSuEAwSWyAP8B8acCOPobgbwnHtlKyqLYuqUXf91M9kTdz0iBcKzpE1GaI8Nq+xzAc4xqnbT0yBrRfP0J9wF4dZ3PT+6wsK1qAIV/+1ZVtQQr39v+JUkcI5JHbuhewV3rIUUnw2AQ+56HUf9HMYONdaMuSP7kqgjL8MncQ2b29s6BTb2tOmun+AKmLlaZaFGSrpjOqKLsxMHUnsCR3uaRGD9xRC2SU5Qtf2chWgaX/eZipFtN9G68lxeoO3jPYkAKjeuS3JBqaZlaCooBKjuyrjdLRr+jZ9Aj3hWptiZzZJEDviAKUqJyZpM/7PSxew8dB+te277IIFhr63ElWcDsS7lAUtUBClYTfTQLZ3BrFHTsI3KEkUcBxs8b4DzSTU3bzluFePlP+XIalNz8PHmZfgW3NECnND9pZyiFETDWEvGSOEiYQ/5CMQbzXrpWMhEtb1Ze6ya23JqDHp6jcsRVp7AoJI0IRWpdexjo+Vy/iizUH670nbAam151zaGPhUtaetuCMX1gBhBqngnR5zVaggqKrXfDR2AmrLVMzuPLEBmKtKKRE7fUhYnGo6d3wUUapTN2G0ariKp0= diff --git a/sonar-project.properties b/sonar-project.properties index 8cb1e803e3..db62db335b 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,9 +1,10 @@ +sonar.host.url=https://sonarcloud.io +sonar.organization=onlyoffice # must be unique in a given SonarQube instance sonar.projectKey=sdkjs:develop # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=sdkjs sonar.projectVersion=1.0 -sonar.branch=develop # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set.