Skip to content

Commit 59efe98

Browse files
committed
Run GH verification build on Windows too
Fixes #1080
1 parent a4387fc commit 59efe98

File tree

3 files changed

+55
-8
lines changed

3 files changed

+55
-8
lines changed

.github/workflows/maven.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-latest, macos-latest]
18+
os: [ubuntu-latest, windows-latest, macos-latest]
1919
runs-on: ${{ matrix.os }}
2020
timeout-minutes: 45
2121

@@ -45,7 +45,11 @@ jobs:
4545
- name: Build m2e-core
4646
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
4747
with:
48-
run: mvn clean verify --batch-mode -Pits -Dtycho.p2.baselineMode=failCommon -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
48+
run: >-
49+
mvn clean verify --batch-mode -Pits
50+
-Dtycho.p2.baselineMode=failCommon
51+
-Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
52+
-Dtycho.surefire.deleteWorkDir=true
4953
- name: Upload Test Results
5054
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
5155
with:

m2e-parent/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,31 @@
239239
</plugins>
240240
</build>
241241
</profile>
242+
<profile>
243+
<id>windows</id>
244+
<activation>
245+
<os>
246+
<family>windows</family>
247+
</os>
248+
</activation>
249+
<properties>
250+
<!-- The Tycho baselinging does not yet work well on Windows.
251+
Temporarily skip it until it is fixed.-->
252+
<tycho.baseline.skip>true</tycho.baseline.skip>
253+
</properties>
254+
<build>
255+
<plugins>
256+
<plugin>
257+
<groupId>org.eclipse.tycho</groupId>
258+
<artifactId>tycho-p2-plugin</artifactId>
259+
<version>${tycho-version}</version>
260+
<configuration>
261+
<baselineMode>warn</baselineMode>
262+
</configuration>
263+
</plugin>
264+
</plugins>
265+
</build>
266+
</profile>
242267
</profiles>
243268

244269
<developers>

org.eclipse.m2e.rcptt.tests/pom.xml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
34
<modelVersion>4.0.0</modelVersion>
4-
5+
56
<parent>
67
<groupId>org.eclipse.m2e</groupId>
78
<artifactId>m2e-core</artifactId>
@@ -11,15 +12,32 @@
1112
<artifactId>org.eclipse.m2e.rcptt.tests</artifactId>
1213
<packaging>rcpttTest</packaging>
1314
<name>M2E - RCPTT Integration tests</name>
14-
15+
1516
<pluginRepositories>
1617
<pluginRepository>
1718
<id>rcptt</id>
1819
<name>Eclipse RCPTT repository</name>
1920
<url>https://repo.eclipse.org/content/repositories/rcptt-releases/</url>
2021
</pluginRepository>
21-
</pluginRepositories>
22-
22+
</pluginRepositories>
23+
24+
<properties>
25+
<product-extension>tar.gz</product-extension>
26+
</properties>
27+
<profiles>
28+
<profile>
29+
<id>windows</id>
30+
<activation>
31+
<os>
32+
<family>windows</family>
33+
</os>
34+
</activation>
35+
<properties>
36+
<product-extension>zip</product-extension>
37+
</properties>
38+
</profile>
39+
</profiles>
40+
2341
<build>
2442
<plugins>
2543
<plugin>
@@ -29,7 +47,7 @@
2947
<extensions>true</extensions>
3048
<configuration>
3149
<aut>
32-
<explicit>../products/m2e-ide/target/products/m2e-ide-[platform].tar.gz</explicit>
50+
<explicit>../products/m2e-ide/target/products/m2e-ide-[platform].${product-extension}</explicit>
3351
</aut>
3452
<testOptions>
3553
<!-- Timeout for entire test suites (in sec) -->

0 commit comments

Comments
 (0)