Skip to content

Commit 284427a

Browse files
reder9Caleb Reder
andauthored
Creder/allowing for multibranch custom workspaces (#64)
* Updates to build with java21 * CI updates for Java 21 * Additional CI updates * Additional CI fixes * Additional CI fixes * Extra fixes * Extra fixes * Additional testing changes * Adding updates to allow us to set custom workspaces * Additional updates * Additional updates * Git cruft fix * Custom workspace improvements * Fix: Remove remaining merge conflict markers - Removed conflict markers from Pipeline.kt - Removed conflict markers from DockerAgent.kt - Build verified successful - All tests passing * Version increment * Fixing workspace path * Version rev * Making this backwards compatible --------- Co-authored-by: Caleb Reder <caleb.reder@code42.com>
1 parent 790a398 commit 284427a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

dsl/src/main/kotlin/com/code42/jenkins/pipelinekt/dsl/PipelineDsl.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ data class PipelineDsl(
9595
}
9696

9797
fun pipeline(
98-
prepSteps: DslContext<Step>.() -> Unit = { },
99-
pipelineBlock: PipelineContext.() -> Unit,
10098
customWorkspace: String? = null,
10199
useMultibranchWorkspace: Boolean = true,
100+
prepSteps: DslContext<Step>.() -> Unit = { },
101+
pipelineBlock: PipelineContext.() -> Unit,
102102
): Pipeline {
103103
val context = PipelineContext(
104104
topLevelStageContext = topLevelStageWrapperContext(),

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.21.10
1+
0.21.11

0 commit comments

Comments
 (0)