Skip to content

Develocity integration #2272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ pom.tycho

/binaries/org.eclipse.swt.*/src/
tmpdir/
.mvn/.develocity/develocity-workspace-id
39 changes: 39 additions & 0 deletions .mvn/develocity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!--
Copyright (c) 2012,2024 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php

Contributors:
Gasper Kojek
-->
<develocity
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
<server>
<url>https://develocity-staging.eclipse.org</url>
</server>
<projectId>eclipse.platform</projectId>
<buildScan>
<obfuscation>
<ipAddresses>0.0.0.0</ipAddresses>
</obfuscation>
<publishing>
<onlyIf>
<![CDATA[authenticated]]>
</onlyIf>
</publishing>
<backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
</buildScan>
<buildCache>
<local>
<enabled>#{isFalse(env['CI'])}</enabled>
</local>
<remote>
<enabled>true</enabled>
<storeEnabled>#{isTrue(env['CI'])}</storeEnabled>
</remote>
</buildCache>
</develocity>
12 changes: 11 additions & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,14 @@
<artifactId>tycho-build</artifactId>
<version>4.0.13</version>
</extension>
</extensions>
<extension>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
<version>2.0.1</version>
</extension>
<extension>
<groupId>com.gradle</groupId>
<artifactId>common-custom-user-data-maven-extension</artifactId>
<version>2.0.3</version>
</extension>
</extensions>
27 changes: 18 additions & 9 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
'''
}
}
}
}
Expand Down
34 changes: 34 additions & 0 deletions tests/org.eclipse.swt.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,39 @@
</dependencies>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<plugin>
<groupId>com.gradle</groupId>
<artifactId>develocity-maven-extension</artifactId>
<configuration>
<develocity>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<inputs>
<fileSets>
<fileSet>
<name>user.home</name>
<paths>
<path>${project.build.directory}</path>
</paths>
<normalization>
<strategy>RELATIVE_PATH</strategy>
<ignoreEmptyDirectories>true</ignoreEmptyDirectories>
<ignoreLineEndings>true</ignoreLineEndings>
</normalization>
</fileSet>
</fileSets>
</inputs>
</plugin>
</plugins>
</develocity>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
Loading