Skip to content

Commit 683f2d2

Browse files
authored
Merge branch 'khorevaa:develop' into develop
2 parents 9e846c5 + ebf19aa commit 683f2d2

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

sonar-project.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ sonar.sources=./src
1616
sonar.sourceEncoding=UTF-8
1717

1818
sonar.coverageReportPaths=coverage/genericCoverage.xml
19-
sonar.bsl.languageserver.reportPaths=./bsl-json.json

sonar-qube.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ temp=`cat packagedef | grep ".Версия(" | sed 's|[^"]*"||' | sed -r 's/".+/
22
version=${temp##*|}
33
if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then
44
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
5-
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
6-
java -jar ./bsl-language-server.jar -a -s ./src -r json
75

86
sonar-scanner \
97
-Dsonar.host.url=https://sonar.silverbulleters.org \
@@ -15,8 +13,6 @@ if [ "$TRAVIS_SECURE_ENV_VARS" == "true" ]; then
1513
-Dsonar.scanner.skip=false
1614

1715
elif [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
18-
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
19-
java -jar ./bsl-language-server.jar -a -s ./src -r json
2016
sonar-scanner \
2117
-Dsonar.host.url=https://sonar.oscript.ru \
2218
-Dsonar.login=$SONAR_TOKEN \

src/core/Классы/КомандаПриложения.os

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
Если ОшибкаЧтения Тогда
403403
Лог.КритичнаяОшибка("Ошибка чтения параметров команды");
404404
ВывестиСправку();
405-
Возврат;
405+
ВызватьИсключение "Ошибка чтения параметров команды";
406406
КонецЕсли;
407407

408408
ВыполнитьДействиеКоманды("ПередВыполнениемКоманды");

0 commit comments

Comments
 (0)