From 7d93aed54f0974b6b83c649be43a80c8e1969c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Spo=CC=88nemann?= Date: Wed, 23 Nov 2016 14:36:33 +0100 Subject: [PATCH] Added p2 repo build --- Jenkinsfile | 21 +- releng/.gitignore | 1 + releng/p2/category.xml | 64 ++++++ releng/p2/pom.xml | 56 ++++++ releng/pom.xml | 188 ++++++++++++++++++ releng/releng-target/pom.xml | 14 ++ releng/releng-target/xtext-core.target.target | 13 ++ 7 files changed, 350 insertions(+), 7 deletions(-) create mode 100644 releng/.gitignore create mode 100644 releng/p2/category.xml create mode 100644 releng/p2/pom.xml create mode 100644 releng/pom.xml create mode 100644 releng/releng-target/pom.xml create mode 100644 releng/releng-target/xtext-core.target.target diff --git a/Jenkinsfile b/Jenkinsfile index 99267c5c8..5947dadd1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,20 +1,27 @@ // tell Jenkins how to build projects from this repository node { try { - stage 'Checkout' checkout scm - - stage 'Build' - sh "./gradlew -PuseJenkinsSnapshots=true cleanLocalMavenRepo clean build createLocalMavenRepo --refresh-dependencies --continue" - archive 'build/maven-repository/**/*.*' + + stage 'Gradle Build' + try { + sh "./gradlew -PuseJenkinsSnapshots=true cleanLocalMavenRepo cleanLocalP2Repo clean build createLocalMavenRepo --refresh-dependencies --continue" + archive 'build/maven-repository/**/*.*' + } finally { + step([$class: 'JUnitResultArchiver', testResults: '**/build/test-results/test/*.xml']) + } + + stage 'Maven Build' + def mvnHome = tool 'M3' + env.M2_HOME = "${mvnHome}" + sh "${mvnHome}/bin/mvn -f releng/pom.xml --batch-mode --update-snapshots clean install" + archive 'build/**/*.*' slackSend "Build Succeeded - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)" } catch (e) { slackSend color: 'danger', message: "Build Failed - ${env.JOB_NAME} ${env.BUILD_NUMBER} (<${env.BUILD_URL}|Open>)" throw e - } finally { - step([$class: 'JUnitResultArchiver', testResults: '**/build/test-results/test/*.xml']) } } \ No newline at end of file diff --git a/releng/.gitignore b/releng/.gitignore new file mode 100644 index 000000000..2f7896d1d --- /dev/null +++ b/releng/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/releng/p2/category.xml b/releng/p2/category.xml new file mode 100644 index 000000000..7207daa84 --- /dev/null +++ b/releng/p2/category.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/p2/pom.xml b/releng/p2/pom.xml new file mode 100644 index 000000000..1f40998c1 --- /dev/null +++ b/releng/p2/pom.xml @@ -0,0 +1,56 @@ + + 4.0.0 + + xtext-core.p2-repository + eclipse-repository + + + org.eclipse.xtext + xtext-core.releng + 2.11.0-SNAPSHOT + .. + + + + 0.25.0 + + + + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho-version} + + + package + + assemble-repository + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.1 + + + install + + run + + + + + + + + + + + + + + diff --git a/releng/pom.xml b/releng/pom.xml new file mode 100644 index 000000000..38bfe91b1 --- /dev/null +++ b/releng/pom.xml @@ -0,0 +1,188 @@ + + 4.0.0 + + org.eclipse.xtext + xtext-core.releng + 2.11.0-SNAPSHOT + pom + + + 0.25.0 + + + + + local-gradle-result + file:${basedir}/../build/maven-repository + + + + false + + jcenter + http://jcenter.bintray.com + + + + + + org.eclipse.xtext + org.eclipse.xtext + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.ide + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.ide + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.ide.tests + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.ide.tests + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.testing + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.testing + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.testlanguages + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.testlanguages + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.testlanguages.ide + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.testlanguages.ide + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.tests + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.tests + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.util + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.util + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.xtext.generator + 2.11.0-SNAPSHOT + sources + + + org.eclipse.xtext + org.eclipse.xtext.xtext.wizard + 2.11.0-SNAPSHOT + + + org.eclipse.xtext + org.eclipse.xtext.xtext.wizard + 2.11.0-SNAPSHOT + sources + + + + + releng-target + p2 + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho-version} + true + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + consider + + + org.eclipse.xtext + xtext-core.target + 2.11.0-SNAPSHOT + + + + + macosx + cocoa + x86_64 + + + win32 + win32 + x86_64 + + + linux + gtk + x86_64 + + + + + + + diff --git a/releng/releng-target/pom.xml b/releng/releng-target/pom.xml new file mode 100644 index 000000000..214eb1a02 --- /dev/null +++ b/releng/releng-target/pom.xml @@ -0,0 +1,14 @@ + + 4.0.0 + + xtext-core.target + eclipse-target-definition + + + org.eclipse.xtext + xtext-core.releng + 2.11.0-SNAPSHOT + .. + + diff --git a/releng/releng-target/xtext-core.target.target b/releng/releng-target/xtext-core.target.target new file mode 100644 index 000000000..b7a678a15 --- /dev/null +++ b/releng/releng-target/xtext-core.target.target @@ -0,0 +1,13 @@ + + + + + + + + + + + + +