Author: centic
Date: Fri Dec 30 08:11:30 2022
New Revision: 1906274
URL: http://svn.apache.org/viewvc?rev=1906274&view=rev
Log:
Jenkins DSL: Do not try to rebuild sources with Gradle for JDK 20
Modified:
poi/trunk/jenkins/create_jobs.groovy
Modified: poi/trunk/jenkins/create_jobs.groovy
URL:
http://svn.apache.org/viewvc/poi/trunk/jenkins/create_jobs.groovy?rev=1906274&r1=1906273&r2=1906274&view=diff
==============================================================================
--- poi/trunk/jenkins/create_jobs.groovy (original)
+++ poi/trunk/jenkins/create_jobs.groovy Fri Dec 30 08:11:30 2022
@@ -56,7 +56,9 @@ def poijobs = [
[ name: 'POI-DSL-1.19', jdk: '1.19', trigger: triggerSundays,
skipcigame: true, skipSpotbugs: true
],
// Jenkins on ci-builds.apache.org does not support spotbugs with a
new enough version of asm for Java18+
- [ name: 'POI-DSL-1.20', jdk: '1.20', trigger: triggerSundays,
skipcigame: true, skipSpotbugs: true, useAnt: true
+ [ name: 'POI-DSL-1.20', jdk: '1.20', trigger: triggerSundays,
skipcigame: true, skipSpotbugs: true,
+ // these two can be removed again when gradle supports JDK 20
+ useAnt: true, skipSourceBuild: true
],
// Use Ant-build for now as selecting IBM JDK via toolchain does not
work (yet)
[ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays,
skipcigame: true, useAnt: true
@@ -466,12 +468,14 @@ poijobs.each { poijob ->
//properties(poijob.properties ?: '')
antInstallation(antRT)
}
- ant {
- targets(['run'] + (poijob.properties ?: []))
- buildFile('poi-integration/build.xml')
- // Properties did not work, so I had to use targets
instead
- //properties(poijob.properties ?: '')
- antInstallation(antRT)
+ if(!poijob.skipSourceBuild) {
+ ant {
+ targets(['run'] + (poijob.properties ?: []))
+ buildFile('poi-integration/build.xml')
+ // Properties did not work, so I had to use
targets instead
+ //properties(poijob.properties ?: '')
+ antInstallation(antRT)
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
