Skip to content

Sonar.oscript.ru #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 17, 2019
Merged

Sonar.oscript.ru #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b574b66
Update sonar-qube.sh
khorevaa Feb 17, 2019
a6ce84c
Update sonar-project.properties
khorevaa Feb 17, 2019
36b577a
Update .travis.yml
khorevaa Feb 17, 2019
1627dc9
Update sonar-qube.sh
khorevaa Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
- >
Expand All @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,3 +16,4 @@ sonar.sources=./src
sonar.sourceEncoding=UTF-8

sonar.coverageReportPaths=coverage/genericCoverage.xml
sonar.bsl.languageserver.reportPaths=./bsl-json.json
10 changes: 7 additions & 3 deletions sonar-qube.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Member

@nixel2007 nixel2007 Feb 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

пулл-реквесты работать не будут, к сожалению. по крайней мере не так.

Copy link
Member Author

@khorevaa khorevaa Feb 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да это я временно! Дальше посмотрим! )

java -jar ./bsl-language-server.jar -a -s ./src -r json

sonar-scanner \
-Dsonar.host.url=https://sonar.silverbulleters.org \
-Dsonar.analysis.mode=issues \
Expand All @@ -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
fi