diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..dff5f3a5 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: java diff --git a/app-core/src/test/java/com/mercury/platform/shared/store/MercuryStoreCoreTest.java b/app-core/src/test/java/com/mercury/platform/shared/store/MercuryStoreCoreTest.java index 526aa61e..b101d659 100644 --- a/app-core/src/test/java/com/mercury/platform/shared/store/MercuryStoreCoreTest.java +++ b/app-core/src/test/java/com/mercury/platform/shared/store/MercuryStoreCoreTest.java @@ -2,6 +2,7 @@ import com.sun.jna.platform.DesktopWindow; import com.sun.jna.platform.WindowUtils; +import org.junit.Before; import org.junit.Test; import rx.observers.TestSubscriber; @@ -11,6 +12,12 @@ public class MercuryStoreCoreTest { + private static final boolean IS_WINDOWS = System.getProperty("os.name").startsWith("Windows"); + @Before + public void windowsOnly() { + org.junit.Assume.assumeTrue(IS_WINDOWS); + } + @Test public void testSoundReducer() throws IOException { TestSubscriber> testSubscriber = new TestSubscriber<>(); diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..96bb26c5 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,28 @@ +# http://www.appveyor.com/docs/appveyor-yml +# This is the standard AppVeyor project for the SDK +# It builds pulls requests and merges to master to ensure that no tests have broken +# +# This follows the 3-project AppVeyor/Maven pattern established in https://github.com/dblock/log4jna/blob/master/AppVeyorMavenRelease.md + +# https://www.appveyor.com/docs/build-environment/#java +# Use the standard "Visual Studio 2015" image, since that has all the required Maven tools + +environment: + JAVA_HOME: C:\Program Files\Java\jdk1.8.0 + M2: $(USERPROFILE)\.m2 + +install: + # Log versions for debugging + - java -version + - mvn --version + +build_script: + - mvn -B clean install -Djna.nosys=true + +# Maven runs the tests as part of the build, so we don't need to run them again +test: off + +cache: + # Cache Maven and m.2 + - '%MAVEN_HOME%' + - '%M2%' \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2c20f0eb..2b0b6d1c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ app app-ui app-core - + app-shared app-local-updater pom