From 0bed78e95938d02aaacff082a937991de9938733 Mon Sep 17 00:00:00 2001 From: Arthur Ramsey <54082931+c42-arthur@users.noreply.github.com> Date: Thu, 10 Aug 2023 08:19:23 -0500 Subject: [PATCH] Support allow empty archive (#37) --- .../dsl/step/declarative/AcrhiveArtifactsDsl.kt | 9 ++++++--- .../internal/step/declarative/ArchiveArtifacts.kt | 4 ++-- version.txt | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/declarative/AcrhiveArtifactsDsl.kt b/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/declarative/AcrhiveArtifactsDsl.kt index d407b553..db953211 100644 --- a/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/declarative/AcrhiveArtifactsDsl.kt +++ b/dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/step/declarative/AcrhiveArtifactsDsl.kt @@ -7,8 +7,11 @@ import com.code42.jenkins.pipelinekt.dsl.DslContext import com.code42.jenkins.pipelinekt.internal.step.declarative.ArchiveArtifacts fun DslContext.archiveArtifacts(artifacts: String, fingerprint: Boolean) = - archiveArtifacts(artifacts.strDouble(), fingerprint) + archiveArtifacts(artifacts.strDouble(), fingerprint, false) -fun DslContext.archiveArtifacts(artifacts: Var.Literal.Str, fingerprint: Boolean) { - add(ArchiveArtifacts(artifacts, fingerprint)) +fun DslContext.archiveArtifacts(artifacts: String, fingerprint: Boolean, allowEmptyArchive: Boolean) = + archiveArtifacts(artifacts.strDouble(), fingerprint, allowEmptyArchive) + +fun DslContext.archiveArtifacts(artifacts: Var.Literal.Str, fingerprint: Boolean, allowEmptyArchive: Boolean) { + add(ArchiveArtifacts(artifacts, fingerprint, allowEmptyArchive)) } diff --git a/internal/src/main/kotlin/com/code42/jenkins/pipelinekt/internal/step/declarative/ArchiveArtifacts.kt b/internal/src/main/kotlin/com/code42/jenkins/pipelinekt/internal/step/declarative/ArchiveArtifacts.kt index ba90a67d..7f3c47cb 100644 --- a/internal/src/main/kotlin/com/code42/jenkins/pipelinekt/internal/step/declarative/ArchiveArtifacts.kt +++ b/internal/src/main/kotlin/com/code42/jenkins/pipelinekt/internal/step/declarative/ArchiveArtifacts.kt @@ -11,8 +11,8 @@ import com.code42.jenkins.pipelinekt.core.writer.GroovyWriter * @param artifacts the artifacts to archive, blob pattern * @param fingerprint whether the artifact is part of the archives fingerprints */ -data class ArchiveArtifacts(val artifacts: Var.Literal.Str, val fingerprint: Boolean = false) : DeclarativeStep, SingletonStep { +data class ArchiveArtifacts(val artifacts: Var.Literal.Str, val fingerprint: Boolean = false, val allowEmptyArchive: Boolean = false) : DeclarativeStep, SingletonStep { override fun toGroovy(writer: GroovyWriter) { - writer.writeln("archiveArtifacts artifacts: ${artifacts.toGroovy()}, fingerprint: $fingerprint") + writer.writeln("archiveArtifacts artifacts: ${artifacts.toGroovy()}, fingerprint: $fingerprint, allowEmptyArchive: $allowEmptyArchive") } } diff --git a/version.txt b/version.txt index 311fe82d..3f46c4d1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.18.21 \ No newline at end of file +0.19.0 \ No newline at end of file