Skip to content

Commit

Permalink
Merge pull request #276 from eclipse/cd_issue275
Browse files Browse the repository at this point in the history
Fix Latest build
  • Loading branch information
cdietrich authored Nov 7, 2023
2 parents dbe4f8f + 9f4bf2a commit 735ee06
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ pipeline {
catchError(buildResult: 'UNSTABLE', stageResult: 'UNSTABLE') {
withMaven(jdk: 'temurin-jdk17-latest', maven: 'apache-maven-3.9.1', options: [junitPublisher(disabled: true), openTasksPublisher(disabled: true)]) {
dir ('git-repo-nightly') {
buildProject("org.eclipse.emf.mwe2.target.nightly", true)
buildProject("org.eclipse.emf.mwe2.target.nightly", true, "4.0.3")
}
}
}
Expand Down Expand Up @@ -259,8 +259,8 @@ EOF

}

def buildProject(targetPlatform, forceLocalDeployment = false) {
withEnv(["TARGET_PLATFORM=$targetPlatform", "FORCE_LOCAL_DEPLOYMENT=$forceLocalDeployment"]) {
def buildProject(targetPlatform, forceLocalDeployment = false, tychoVersion = "2.7.5") {
withEnv(["TARGET_PLATFORM=$targetPlatform", "FORCE_LOCAL_DEPLOYMENT=$forceLocalDeployment", "TYCHO_VERSION=$tychoVersion"]) {
sh '''
GOALS='clean javadoc:aggregate-jar test deploy'
if [ "${FORCE_LOCAL_DEPLOYMENT}" == "true" ] || [ "${BRANCH_NAME}" != "master" ] && [ "${RELEASE_TYPE}" == "Integration" ] && [ "${FORCE_PUBLISH}" != "true" ]; then
Expand All @@ -274,8 +274,10 @@ def buildProject(targetPlatform, forceLocalDeployment = false) {
esac
mvn \
-f maven/org.eclipse.emf.mwe2.parent/pom.xml \
-e -f maven/org.eclipse.emf.mwe2.parent/pom.xml \
-Dtycho-version=${TYCHO_VERSION} \
-Dsign.skip=false \
-Dtycho.resolver.classic=true \
-DtestFailureIgnore=true \
-Dmaven.javadoc.failOnError=false \
-Dtycho.localArtifacts=ignore \
Expand Down

0 comments on commit 735ee06

Please sign in to comment.