From 40fc1b4cc812457f776b74713ddeaa5bb6e8b373 Mon Sep 17 00:00:00 2001 From: Nikita Gryzlov Date: Thu, 16 Apr 2020 12:43:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B2=20cmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ru/pulsar/jenkins/library/IStepExecutor.groovy | 2 +- src/ru/pulsar/jenkins/library/StepExecutor.groovy | 2 +- src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy index 134cbd4..6cb051f 100644 --- a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy +++ b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy @@ -18,7 +18,7 @@ interface IStepExecutor { void cmd(String script, boolean returnStatus) - void cmd(String gString) + void cmd(String script) void tool(String toolName) diff --git a/src/ru/pulsar/jenkins/library/StepExecutor.groovy b/src/ru/pulsar/jenkins/library/StepExecutor.groovy index b10a577..b38f5ce 100644 --- a/src/ru/pulsar/jenkins/library/StepExecutor.groovy +++ b/src/ru/pulsar/jenkins/library/StepExecutor.groovy @@ -42,7 +42,7 @@ class StepExecutor implements IStepExecutor { @Override void cmd(String script, boolean returnStatus = false) { - steps.cmd script: script, returnStatus: returnStatus + steps.cmd(script, returnStatus) } @Override diff --git a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy index fb33668..ed96b3c 100644 --- a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy +++ b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy @@ -37,7 +37,7 @@ class SonarScanner implements Serializable { sonarScannerBinary = "$scannerHome/bin/sonar-scanner" } - def sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME" + String sonarCommand = "$sonarScannerBinary -Dsonar.branch.name=$env.BRANCH_NAME" String configurationVersion = VersionParser.configuration(rootFile) if (configurationVersion) {