krak/jenkins-lib
1
0
Fork 0
forked from jenkins/jenkins-lib
Code Activity

Исправление опечатки

Browse Source
This commit is contained in:
ivanovEV
2024-02-26 14:17:23 +03:00
parent c36861e7be
commit 870d537c97
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ru/pulsar/jenkins/library/configuration/InitExtentionMethod.groovy → src/ru/pulsar/jenkins/library/configuration/InitExtensionMethod.groovy
View File

@@ -2,7 +2,7 @@ package ru.pulsar.jenkins.library.configuration
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
enum InitExtentionMethod { enum InitExtensionMethod {
@JsonProperty("fromSource") @JsonProperty("fromSource")
SOURCE, SOURCE,

2
src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy
View File

@@ -39,7 +39,7 @@ class InitInfoBaseOptions implements Serializable {
* fromSource - инициализация расширения из исходников; * fromSource - инициализация расширения из исходников;
* fromInternet - скачивание скомпилированного cfe по ссылке. * fromInternet - скачивание скомпилированного cfe по ссылке.
""") """)
InitExtentionMethod initMethod = InitExtentionMethod.SOURCE; InitExtensionMethod initMethod = InitExtensionMethod.SOURCE;
@JsonPropertyDescription(""" @JsonPropertyDescription("""
Хранит в себе путь к расширению. Хранит в себе путь к расширению.

4
src/ru/pulsar/jenkins/library/steps/EdtToDesignerFormatTransformation.groovy
View File

@@ -4,7 +4,7 @@ package ru.pulsar.jenkins.library.steps
import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.IStepExecutor
import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.configuration.SourceFormat import ru.pulsar.jenkins.library.configuration.SourceFormat
import ru.pulsar.jenkins.library.configuration.InitExtentionMethod import ru.pulsar.jenkins.library.configuration.InitExtensionMethod
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.EDT import ru.pulsar.jenkins.library.utils.EDT
import ru.pulsar.jenkins.library.utils.FileUtils import ru.pulsar.jenkins.library.utils.FileUtils
@@ -73,7 +73,7 @@ class EdtToDesignerFormatTransformation implements Serializable {
config.initInfoBaseOptions.extensions.each { config.initInfoBaseOptions.extensions.each {
if (it.initMethod != InitExtentionMethod.SOURCE) { if (it.initMethod != InitExtensionMethod.SOURCE) {
return return
} }

4
src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy
View File

@@ -3,7 +3,7 @@ package ru.pulsar.jenkins.library.steps
import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.IStepExecutor
import ru.pulsar.jenkins.library.configuration.JobConfiguration import ru.pulsar.jenkins.library.configuration.JobConfiguration
import ru.pulsar.jenkins.library.configuration.SourceFormat import ru.pulsar.jenkins.library.configuration.SourceFormat
import ru.pulsar.jenkins.library.configuration.InitExtentionMethod import ru.pulsar.jenkins.library.configuration.InitExtensionMethod
import ru.pulsar.jenkins.library.configuration.InitInfoBaseOptions.Extension import ru.pulsar.jenkins.library.configuration.InitInfoBaseOptions.Extension
import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.ioc.ContextRegistry
import ru.pulsar.jenkins.library.utils.Logger import ru.pulsar.jenkins.library.utils.Logger
@@ -44,7 +44,7 @@ class GetExtensions implements Serializable {
extractConvertedExtensions(sourceDirName, steps) extractConvertedExtensions(sourceDirName, steps)
config.initInfoBaseOptions.extensions.each { config.initInfoBaseOptions.extensions.each {
if (it.initMethod == InitExtentionMethod.SOURCE) { if (it.initMethod == InitExtensionMethod.SOURCE) {
Logger.println("Сборка расширения ${it.name} из исходников") Logger.println("Сборка расширения ${it.name} из исходников")
String srcDir = getSrcDir(it, sourceDirName) String srcDir = getSrcDir(it, sourceDirName)
buildExtension(it, srcDir, vrunnerPath, steps) buildExtension(it, srcDir, vrunnerPath, steps)

1
test/integration/groovy/jobConfigurationTest.groovy
View File

@@ -74,6 +74,5 @@ class jobConfigurationTest {
rule.assertLogContains("v8version='8.3.12.1500'", run) rule.assertLogContains("v8version='8.3.12.1500'", run)
rule.assertLogContains("sonarScannerToolName='sonar-scanner'", run) rule.assertLogContains("sonarScannerToolName='sonar-scanner'", run)
rule.assertLogContains("initMethod=FROM_SOURCE", run) rule.assertLogContains("initMethod=FROM_SOURCE", run)
rule.assertLogContains("path=\"/src/cfe/тест\"", run)
} }
} }