diff --git a/.gitignore b/.gitignore index b8efd10adef..43d1cb3acbe 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ pom.tycho /binaries/org.eclipse.swt.*/src/ tmpdir/ +.mvn/.develocity/develocity-workspace-id diff --git a/.mvn/develocity.xml b/.mvn/develocity.xml new file mode 100644 index 00000000000..10f3b11129b --- /dev/null +++ b/.mvn/develocity.xml @@ -0,0 +1,39 @@ + + + + + https://develocity-staging.eclipse.org + + eclipse.platform + + + 0.0.0.0 + + + + + + + #{isFalse(env['CI'])} + + + + #{isFalse(env['CI'])} + + + true + #{isTrue(env['CI'])} + + + diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 51d63c526a4..6e16509be70 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -6,4 +6,14 @@ tycho-build 4.0.13 - \ No newline at end of file + + com.gradle + develocity-maven-extension + 2.0.1 + + + com.gradle + common-custom-user-data-maven-extension + 2.0.3 + + diff --git a/Jenkinsfile b/Jenkinsfile index 9e75d34dc4c..8ed7a30af56 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,13 @@ * Hannes Wellmann - Streamline entire SWT build and replace ANT-scripts by Maven, Jenkins-Pipeline and single-source Java scripts *******************************************************************************/ +def secrets = [ + [path: 'cbi/eclipse.platform/develocity.eclipse.org', secretValues: [ + [envVar: 'DEVELOCITY_ACCESS_KEY', vaultKey: 'api-token'] + ] + ] +] + def runOnNativeBuildAgent(String platform, Closure body) { def final nativeBuildStageName = 'Build SWT-native binaries' def dockerImage = null @@ -336,15 +343,17 @@ pipeline { stage('Build') { steps { xvnc(useXauthority: true) { - dir('eclipse.platform.swt') { - sh ''' - mvn clean verify \ - --batch-mode --threads 1C -V -U -e \ - -Pbree-libs -Papi-check -Pjavadoc \ - -Dcompare-version-with-baselines.skip=false \ - -Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \ - -Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true - ''' + withVault([vaultSecrets: secrets]) { + dir('eclipse.platform.swt') { + sh ''' + mvn clean verify \ + --batch-mode --threads 1C -V -U -e \ + -Pbree-libs -Papi-check -Pjavadoc \ + -Dcompare-version-with-baselines.skip=false \ + -Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \ + -Dmaven.test.failure.ignore=false -Dmaven.test.error.ignore=false + ''' + } } } } diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml index 2c426e6576e..b0322753843 100644 --- a/tests/org.eclipse.swt.tests/pom.xml +++ b/tests/org.eclipse.swt.tests/pom.xml @@ -88,5 +88,39 @@ + + + + + com.gradle + develocity-maven-extension + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + user.home + + ${project.build.directory} + + + RELATIVE_PATH + true + true + + + + + + + + + + +