@@ -71,7 +71,7 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
7171}
7272
7373def getLatestGitTag () {
74- return sh(script : ' git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*' , returnStdout : true ). strip ()
74+ return sh(script : ' git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*' , returnStdout : true ). trim ()
7575}
7676
7777def getSWTVersions () { // must be called from the repository root
@@ -89,7 +89,7 @@ pipeline {
8989 skipDefaultCheckout() // Specialiced checkout is performed below
9090 timestamps()
9191 timeout(time : 180 , unit : ' MINUTES' )
92- buildDiscarder(logRotator(numToKeepStr :' 5 ' ))
92+ buildDiscarder(logRotator(numToKeepStr : ' master ' . equals(env . BRANCH_NAME ) ? ' 20 ' : ' 5 ' , artifactNumToKeepStr : ' master ' . equals(env . BRANCH_NAME ) ? ' 3 ' : ' 1 ' ))
9393 disableConcurrentBuilds(abortPrevious : true )
9494 }
9595 agent {
@@ -159,7 +159,7 @@ pipeline {
159159 def sources = sourceFoldersProps. collectEntries{ k , src -> [ k, src. split(' ,' ). collect{ f -> ' \' ' + f + ' \' ' }. join(' ' ) ] }
160160 for (ws in allWS) {
161161 def diff = sh(script : " git diff HEAD ${ swtTag} ${ sources.src_common} ${ sources['src_' + ws]} " , returnStdout : true )
162- if (! diff. strip (). isEmpty()) {
162+ if (! diff. trim (). isEmpty()) {
163163 NATIVES_CHANGED + = ws
164164 }
165165 }
@@ -351,7 +351,7 @@ pipeline {
351351 sh '''
352352 mvn clean verify \
353353 --batch-mode --threads 1C -V -U -e -DforkCount=0 \
354- -Papi-check \
354+ -Pbree-libs - Papi-check -Pjavadoc \
355355 -Dcompare-version-with-baselines.skip=false \
356356 -Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \
357357 -Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true
0 commit comments