From c899279b55e740f68e315f192cacbf1e4eebe258 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 10 Jan 2019 22:41:04 +0100 Subject: [PATCH 1/5] initial travis config file --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml 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 From 497e7ce98969fc2083352896c8d2e50466603718 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 10 Jan 2019 22:55:48 +0100 Subject: [PATCH 2/5] put app-shared back so that it compiles --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b72e0bb6976a4039d4f570b0a9d4189e8070054a Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 10 Jan 2019 23:09:16 +0100 Subject: [PATCH 3/5] windows only test --- .../platform/shared/store/MercuryStoreCoreTest.java | 7 +++++++ 1 file changed, 7 insertions(+) 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<>(); From c0a6ea701ddc8e026a757f1aa03aa84d41a7afa3 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 10 Jan 2019 23:20:36 +0100 Subject: [PATCH 4/5] initial appveyor config --- appveyor.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..7f83e4c2 --- /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 + +# 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 From 74734b485a3a35435996090e198a65bd20b707c7 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Thu, 10 Jan 2019 23:28:34 +0100 Subject: [PATCH 5/5] workaround the "There is an incompatible JNA native library installed on this system" issue on appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7f83e4c2..96bb26c5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ install: - mvn --version build_script: - - mvn -B clean install + - 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