diff --git a/.travis.yml b/.travis.yml index 3f3affb..eea75a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,14 +27,6 @@ before_install: # Load cached docker images - if [[ -d $HOME/docker ]]; then ls $HOME/docker/*.tar.gz | xargs -I {file} sh -c "zcat {file} | docker load"; fi -before_script: - - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - - chmod +x ./cc-test-reporter - - ./cc-test-reporter before-build - -after_script: - - ./cc-test-reporter after-build --prefix "/home/travis/build/khorevaa/cli/coverage/" --exit-code $TRAVIS_TEST_RESULT - before_cache: # Save tagged docker images - > @@ -50,7 +42,7 @@ script: - grep 'Результат прогона тестов <Да>' /tmp/test.log after_success: # - bash <(curl -s https://codecov.io/bash) - # - ./sonar-qube.sh + - ./sonar-qube.sh cache: directories: diff --git a/sonar-project.properties b/sonar-project.properties index c6d2b50..55ffdd8 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,6 +1,6 @@ # must be unique in a given SonarQube instance -sonar.projectKey=opensource-cli -sonar.organization=sonar-opensource-add +sonar.projectKey=cli +# sonar.organization=sonar-opensource-add # this is the name displayed in the SonarQube UI sonar.projectName=Command Line Interface for OScript @@ -16,3 +16,4 @@ sonar.sources=./src sonar.sourceEncoding=UTF-8 sonar.coverageReportPaths=coverage/genericCoverage.xml +sonar.bsl.languageserver.reportPaths=./bsl-json.json diff --git a/sonar-qube.sh b/sonar-qube.sh index f56f2f2..b9b8021 100755 --- a/sonar-qube.sh +++ b/sonar-qube.sh @@ -1,8 +1,10 @@ temp=`cat packagedef | grep ".Версия(" | sed 's|[^"]*"||' | sed -r 's/".+//'` version=${temp##*|} - if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then + wget -O bsl-language-server.jar https://github.com/1c-syntax/bsl-language-server/releases/download/v0.3.0/bsl-language-server-0.3.0.jar + java -jar ./bsl-language-server.jar -a -s ./src -r json + sonar-scanner \ -Dsonar.host.url=https://sonar.silverbulleters.org \ -Dsonar.analysis.mode=issues \ @@ -13,10 +15,12 @@ if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then -Dsonar.scanner.skip=false elif [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + wget -O bsl-language-server.jar https://github.com/1c-syntax/bsl-language-server/releases/download/v0.3.0/bsl-language-server-0.3.0.jar + java -jar ./bsl-language-server.jar -a -s ./src -r json sonar-scanner \ - -Dsonar.host.url=https://sonar.silverbulleters.org \ + -Dsonar.host.url=https://sonar.oscript.ru \ -Dsonar.login=$SONAR_TOKEN \ -Dsonar.projectVersion=$version\ -Dsonar.scanner.skip=false fi -fi \ No newline at end of file +fi