Skip to content
Merged
Changes from all commits
Commits
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: 4 additions & 6 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ mavenEnv(jdk: 21) {
if (junit(testResults: '**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml').failCount > 0) {
error 'Some test failures during prep.sh, not going to continue'
}
// Publish incrementals before prep archive preparation to avoid dirty git status
infra.prepareToPublishIncrementals()
}
}
}
Expand Down Expand Up @@ -142,6 +140,10 @@ mavenEnv(jdk: 21) {
stash name: line, includes: "pct.sh,excludes.txt,bom-*/excludes.txt,target/pct.jar,target/megawar-${line}.war"
}
}

stage('') {
infra.prepareToPublishIncrementals()
}
}

stage('run pct') {
Expand Down Expand Up @@ -244,10 +246,6 @@ stage('flag checks') {
}

stage('publish incrementals') {
if (prepFoundInBuildNumber > 0) {
catchError(buildResult: 'SUCCESS', stageResult: 'NOT_BUILT') { error('[SKIP] No new prep to publish to incrementals') }
return
}
infra.maybePublishIncrementals()
}

Expand Down