Skip to content

Adapt to Declarative change#337

Merged
jglick merged 2 commits intojenkinsci:masterfrom
jglick:closuritis
Feb 25, 2025
Merged

Adapt to Declarative change#337
jglick merged 2 commits intojenkinsci:masterfrom
jglick:closuritis

Conversation

@jglick
Copy link
Member

@jglick jglick commented Feb 25, 2025

Adapts to jenkinsci/pipeline-model-definition-plugin#762, which is unfortunately incompatible in that DeclarativeDockerUtils.getLabelScript is going to return a new type of object. (Due to the complex mixture of CPS-transformed Groovy sources and Java APIs, it did not seem feasible to make that a compatible change.)

@jglick jglick added the bug label Feb 25, 2025
@jglick jglick changed the title Avoid excessive Closures Adapt to Declarative change Feb 25, 2025
@jglick jglick enabled auto-merge February 25, 2025 18:55
Copy link
Member

@jtnord jtnord left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks reasonable as far as I understand it

} else {
runImage(body).call()
protected void configureRegistry(Closure body) {
DeclarativeDockerUtils.DockerRegistry registry = DeclarativeDockerUtils.DockerRegistry.build(describable.registryUrl, describable.registryCredentialsId)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ignore whitespace)

@jglick jglick merged commit 76126c7 into jenkinsci:master Feb 25, 2025
16 of 17 checks passed
@jglick jglick deleted the closuritis branch February 25, 2025 19:22
lnlrbr pushed a commit to lnlrbr/docker-workflow-plugin that referenced this pull request Jul 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants