Skip to content

Commit

Permalink
fix: Изменены настройки Sonar;
Browse files Browse the repository at this point in the history
Настроено использование moskito и 1testrunner из публичного хаба;
Добавлены badges в readme.
  • Loading branch information
arkuznetsov committed Sep 23, 2019
1 parent 9981a72 commit 7c8105b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 19 deletions.
9 changes: 2 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dist: trusty
addons:
sonarqube: true
jdk:
- oraclejdk8
- openjdk11
before_install:
- chmod +x travis.sh
- sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
Expand All @@ -13,16 +13,11 @@ before_install:
- wget -O os.deb http://oscript.io/downloads/night-build/deb
- sudo dpkg -i os.deb; sudo apt install -f
- oscript
- sudo git clone -b develop http://github.com/arkuznetsov/1testrunner ./testrunner
- sudo opm build ./testrunner -out ./testrunner
- sudo git clone -b develop http://github.com/arkuznetsov/moskito ./moskito
- sudo opm build ./moskito -out ./moskito
install:
- sudo opm install
- sudo opm install 1testrunner
- sudo opm install v8runner
- sudo opm install -f ./moskito/moskito-0.4.0.ospx
- sudo opm install -f ./testrunner/1testrunner-1.5.3.ospx
- sudo opm install moskito

cache:
directories:
Expand Down
8 changes: 5 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Библиотека управления кластером 1С
[![GitHub release](https://img.shields.io/github/release/ArKuznetsov/irac.svg?style=flat-square)](https://github.com/ArKuznetsov/irac/releases)
[![GitHub license](https://img.shields.io/github/license/ArKuznetsov/irac.svg?style=flat-square)](https://github.com/ArKuznetsov/irac/blob/develop/LICENSE.md)
[![Build Status](https://travis-ci.org/arkuznetsov/irac.svg?branch=develop)](https://travis-ci.org/arkuznetsov/irac)
[![Quality Gate](https://sonar.silverbulleters.org/api/badges/gate?key=opensource-irac)](https://sonar.silverbulleters.org/dashboard/index/opensource-irac)
[![Coverage](https://sonar.silverbulleters.org/api/badges/measure?key=opensource-irac&metric=coverage)](https://sonar.silverbulleters.org/dashboard/index/opensource-irac)
[![Tech debt](https://sonar.silverbulleters.org/api/badges/measure?key=opensource-irac&metric=sqale_debt_ratio)](https://sonar.silverbulleters.org/dashboard/index/opensource-irac)
[![Quality Gate](https://oskk-sonar.1solution.ru/api/badges/gate?key=irac)](https://sonar.silverbulleters.org/dashboard/index/irac)
[![Coverage](https://oskk-sonar.1solution.ru/api/badges/measure?key=irac&metric=coverage)](https://oskk-sonar.1solution.ru/dashboard/index/irac)
[![Tech debt](https://oskk-sonar.1solution.ru/api/badges/measure?key=irac&metric=sqale_debt_ratio)](https://oskk-sonar.1solution.ru/dashboard/index/irac)

## Назначение

Expand Down
6 changes: 2 additions & 4 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# must be unique in a given SonarQube instance
sonar.projectKey=opensource-irac
sonar.projectKey=irac

# this is the name displayed in the SonarQube UI
sonar.projectName=opensource-irac
sonar.projectName=irac

# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# Since SonarQube 4.2, this property is optional if sonar.modules is set.
Expand All @@ -15,8 +15,6 @@ sonar.tests=./tests
# Encoding of the source code. Default is default system encoding
sonar.sourceEncoding=UTF-8

sonar.organization=sonar-opensource-add

sonar.coverageReportPaths=coverage/genericCoverage.xml

sonar.testExecutionReportPaths=test-reports/tests.xml
10 changes: 5 additions & 5 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ version=${temp##*|}
if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
sonar-scanner \
-Dsonar.host.url=https://opensonar.silverbulleters.org \
-Dsonar.host.url=$SONAR_HOST \
-Dsonar.analysis.mode=issues \
-Dsonar.github.pullRequest=$TRAVIS_PULL_REQUEST \
-Dsonar.github.repository=$TRAVIS_REPO_SLUG \
-Dsonar.github.oauth=$SONAR_GITHUB_TOKEN \
-Dsonar.login=$SONAR_TOKEN \
-Dsonar.scanner.skip=false \
-Dsonar.branch.name=
-Dsonar.branch.name=$TRAVIS_BRANCH

elif [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
sonar-scanner \
-Dsonar.host.url=https://opensonar.silverbulleters.org \
-Dsonar.host.url=$SONAR_HOST \
-Dsonar.login=$SONAR_TOKEN \
-Dsonar.projectVersion=$version\
-Dsonar.projectVersion=$version \
-Dsonar.scanner.skip=false \
-Dsonar.branch.name=
-Dsonar.branch.name=$TRAVIS_BRANCH
fi
fi

0 comments on commit 7c8105b

Please sign in to comment.