Skip to content

Commit c81fdc6

Browse files
authored
Merge pull request #345 from Tyrael/travis
adding some CI integrations
2 parents 2169d96 + 74734b4 commit c81fdc6

File tree

4 files changed

+37
-1
lines changed

4 files changed

+37
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
language: java

app-core/src/test/java/com/mercury/platform/shared/store/MercuryStoreCoreTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.sun.jna.platform.DesktopWindow;
44
import com.sun.jna.platform.WindowUtils;
5+
import org.junit.Before;
56
import org.junit.Test;
67
import rx.observers.TestSubscriber;
78

@@ -11,6 +12,12 @@
1112

1213

1314
public class MercuryStoreCoreTest {
15+
private static final boolean IS_WINDOWS = System.getProperty("os.name").startsWith("Windows");
16+
@Before
17+
public void windowsOnly() {
18+
org.junit.Assume.assumeTrue(IS_WINDOWS);
19+
}
20+
1421
@Test
1522
public void testSoundReducer() throws IOException {
1623
TestSubscriber<Map<String,String>> testSubscriber = new TestSubscriber<>();

appveyor.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# http://www.appveyor.com/docs/appveyor-yml
2+
# This is the standard AppVeyor project for the SDK
3+
# It builds pulls requests and merges to master to ensure that no tests have broken
4+
#
5+
# This follows the 3-project AppVeyor/Maven pattern established in https://github.com/dblock/log4jna/blob/master/AppVeyorMavenRelease.md
6+
7+
# https://www.appveyor.com/docs/build-environment/#java
8+
# Use the standard "Visual Studio 2015" image, since that has all the required Maven tools
9+
10+
environment:
11+
JAVA_HOME: C:\Program Files\Java\jdk1.8.0
12+
M2: $(USERPROFILE)\.m2
13+
14+
install:
15+
# Log versions for debugging
16+
- java -version
17+
- mvn --version
18+
19+
build_script:
20+
- mvn -B clean install -Djna.nosys=true
21+
22+
# Maven runs the tests as part of the build, so we don't need to run them again
23+
test: off
24+
25+
cache:
26+
# Cache Maven and m.2
27+
- '%MAVEN_HOME%'
28+
- '%M2%'

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<module>app</module>
1313
<module>app-ui</module>
1414
<module>app-core</module>
15-
<!--<module>app-shared</module>-->
15+
<module>app-shared</module>
1616
<module>app-local-updater</module>
1717
</modules>
1818
<packaging>pom</packaging>

0 commit comments

Comments
 (0)