Enable JDK 17 testing even on PRs

yrodiere · yrodiere · commit 60a4a467412c · 2025-06-18T10:30:15.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -103,7 +103,7 @@ stage('Build') {
 	Map<String, Map<String, String>> state = [:]
 	environments.each { BuildEnvironment buildEnv ->
 		// Don't build environments for newer JDKs when this is a PR, unless the PR is labelled with 'jdk' or 'jdk-<version>'
-		if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion &&
+		if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion && buildEnv.testJdkVersion.toInteger() > DEFAULT_JDK_VERSION &&
 				!pullRequest.labels.contains( 'jdk' ) && !pullRequest.labels.contains( "jdk-${buildEnv.testJdkVersion}" ) ) {
 			return
 		}

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ stage('Build') {`
`103`	`103`	`Map<String, Map<String, String>> state = [:]`
`104`	`104`	`environments.each { BuildEnvironment buildEnv ->`
`105`	`105`	`// Don't build environments for newer JDKs when this is a PR, unless the PR is labelled with 'jdk' or 'jdk-<version>'`
`106`		`- if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion &&`
	`106`	`+ if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion && buildEnv.testJdkVersion.toInteger() > DEFAULT_JDK_VERSION &&`
`107`	`107`	`!pullRequest.labels.contains( 'jdk' ) && !pullRequest.labels.contains( "jdk-${buildEnv.testJdkVersion}" ) ) {`
`108`	`108`	`return`
`109`	`109`	`}`