Skip to content

Pass -P-consume-incrementals unless a PR specifically includes marker file consume-incrementals #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jglick wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Pass -P-consume-incrementals unless a PR specifically includes marker file consume-incrementals #991

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
35c3f65
Pass `-P-consume-incrementals` on origin repo builds
jglick Feb 9, 2026
7ad5352
Merge branch 'master' of https://github.com/jenkins-infra/pipeline-li…
jglick Feb 13, 2026
75cc91a
Switching to marker file approach
jglick Feb 13, 2026
e9d1b33
Syntax error
jglick Feb 13, 2026
ba892ab
Wrong step name
jglick Feb 13, 2026
6c4de93
`github-checks` apparently neglects to escape backticks
jglick Feb 13, 2026
05af9b1
Typo
jglick Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions vars/buildPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def call(Map params = [:]) {
timeoutValue = 180
}

boolean consumingIncrementals = false
boolean publishingIncrementals = false
boolean archivedArtifacts = false
Map tasks = [failFast: failFast]
Expand Down Expand Up @@ -125,6 +126,12 @@ def call(Map params = [:]) {
mavenOptions += "help:evaluate -Dexpression=changelist -Doutput=$changelistF"
}
}
if (fileExists('consume-incrementals')) {
Copy link
Contributor Author

@jglick jglick Feb 13, 2026

Choose a reason for hiding this comment

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

Alternately, we could just have a marker file incrementals which would gate both production and consumption of incrementals. Thus, when developing paired upstream/downstream PRs, you would need to create this file on both PRs, and delete it prior to merging. (Assuming CD, the upstream PR would deploy a release after merging. jenkins-infra/interesting-category-action#1 would make this friendlier.)

Copy link
Member

@timja timja Feb 14, 2026

Choose a reason for hiding this comment

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

I'd rather avoid the production one unless its really needed.

consumingIncrementals = true
} else {
echo 'Forbidding use of Incremental dependencies. If you need to consume Incrementals, add a file named `consume-incrementals` to the repository root. (Contents arbitrary but conventionally a list of upstream PRs.) Then keep this PR in draft until the dependency has been switched to a release version and the marker file can be removed.'
mavenOptions += '-P-consume-incrementals'
}
if (jenkinsVersion) {
mavenOptions += "-Djenkins.version=${jenkinsVersion} -Daccess-modifier-checker.failOnError=false"
}
Expand Down Expand Up @@ -308,6 +315,9 @@ def call(Map params = [:]) {
if (publishingIncrementals) {
infra.maybePublishIncrementals()
}
if (consumingIncrementals) {
unstable "This build consumed Incremental dependencies. Remove the 'consume-incrementals' file before readying for review."
}
}

private void discoverReferenceBuild() {
Expand Down