Initial support for local cross-platform CI tests

jjlauer · jjlauer · commit 9982663eb840 · 2025-01-08T16:00:08.000-05:00
diff --git a/.blaze/blaze.conf b/.blaze/blaze.conf
@@ -1,4 +1,6 @@
 blaze.dependencies = [
+    "com.fizzed:blaze-ssh"
+    "com.fizzed:buildx:1.0.7"
     "com.fizzed:jne:4.1.1"
 ]
 
diff --git a/.blaze/blaze.java b/.blaze/blaze.java
@@ -1,6 +1,8 @@
 import com.fizzed.blaze.Config;
 import com.fizzed.blaze.Contexts;
 import com.fizzed.blaze.Task;
+import com.fizzed.buildx.Buildx;
+import com.fizzed.buildx.Target;
 import com.fizzed.jne.HardwareArchitecture;
 import com.fizzed.jne.JavaHome;
 import com.fizzed.jne.JavaHomeFinder;
@@ -87,4 +89,26 @@ public void test_all_jdks() throws Exception {
         jdks.forEach(jdk -> log.info("  {}", jdk));
     }
 
+    private final List<Target> crossTestTargets = asList(
+        new Target("linux", "x64").setTags("test").setHost("build-x64-linux-latest"),
+        new Target("linux", "arm64").setTags("test").setHost("build-arm64-linux-latest"),
+        new Target("linux", "riscv64").setTags("test").setHost("build-riscv64-linux-latest"),
+        new Target("macos", "x64").setTags("test").setHost("build-x64-macos-latest"),
+        new Target("macos", "arm64").setTags("test").setHost("build-arm64-macos-latest"),
+        new Target("windows", "x64").setTags("test").setHost("build-x64-windows-latest"),
+        new Target("windows", "arm64").setTags("test").setHost("build-arm64-windows-latest"),
+        new Target("freebsd", "x64").setTags("test").setHost("build-x64-freebsd-latest"),
+        new Target("openbsd", "x64").setTags("test").setHost("build-x64-openbsd-latest")
+    );
+
+    @Task(order = 1)
+    public void cross_tests() throws Exception {
+        new Buildx(crossTestTargets)
+            .tags("test")
+            .execute((target, project) -> {
+                project.action("mvn", "clean", "test")
+                    .run();
+            });
+    }
+
 }
diff --git a/.blaze/pom.xml b/.blaze/pom.xml
@@ -60,6 +60,16 @@
       <artifactId>zt-exec</artifactId>
       <version>1.12</version>
     </dependency>
+    <dependency>
+      <groupId>com.fizzed</groupId>
+      <artifactId>blaze-ssh</artifactId>
+      <version>1.5.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fizzed</groupId>
+      <artifactId>buildx</artifactId>
+      <version>1.0.7</version>
+    </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>jne</artifactId>
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ target
 *.iml
 nb-configuration.xml
 .idea
+.buildx
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/AbstractBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/AbstractBigMapTest.java
@@ -16,6 +16,7 @@
 package com.fizzed.bigmap;
 
 import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.*;
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedMapTest.java
@@ -16,12 +16,25 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.rocksdb.RocksBigLinkedMapBuilder;
+import com.fizzed.jne.HardwareArchitecture;
+import com.fizzed.jne.NativeTarget;
+import com.fizzed.jne.OperatingSystem;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.nio.file.Paths;
 import java.util.Map;
 
+@DisabledIf("isUnsupportedOs")
 public class RocksBigLinkedMapTest extends AbstractBigLinkedMapTest {
 
+    static public boolean isUnsupportedOs() {
+        final NativeTarget current = NativeTarget.detect();
+        return current.getOperatingSystem() == OperatingSystem.FREEBSD
+            || current.getOperatingSystem() == OperatingSystem.OPENBSD
+            || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64)
+            || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64);
+    }
+
     @Override
     public <K,V> Map<K, V> newMap(Class<K> keyType, Class<V> valueType) {
         return new RocksBigLinkedMapBuilder<K,V>()
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigLinkedSetTest.java
@@ -16,12 +16,25 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.rocksdb.RocksBigLinkedSetBuilder;
+import com.fizzed.jne.HardwareArchitecture;
+import com.fizzed.jne.NativeTarget;
+import com.fizzed.jne.OperatingSystem;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.nio.file.Paths;
 import java.util.Set;
 
+@DisabledIf("isUnsupportedOs")
 public class RocksBigLinkedSetTest extends AbstractBigLinkedSetTest {
 
+    static public boolean isUnsupportedOs() {
+        final NativeTarget current = NativeTarget.detect();
+        return current.getOperatingSystem() == OperatingSystem.FREEBSD
+            || current.getOperatingSystem() == OperatingSystem.OPENBSD
+            || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64)
+            || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64);
+    }
+
     @Override
     public <V> Set<V> newSet(Class<V> valueType) {
         return new RocksBigLinkedSetBuilder<V>()
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigMapTest.java
@@ -16,12 +16,25 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.rocksdb.RocksBigMapBuilder;
+import com.fizzed.jne.HardwareArchitecture;
+import com.fizzed.jne.NativeTarget;
+import com.fizzed.jne.OperatingSystem;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.nio.file.Paths;
 import java.util.Map;
 
+@DisabledIf("isUnsupportedOs")
 public class RocksBigMapTest extends AbstractBigMapTest {
 
+    static public boolean isUnsupportedOs() {
+        final NativeTarget current = NativeTarget.detect();
+        return current.getOperatingSystem() == OperatingSystem.FREEBSD
+            || current.getOperatingSystem() == OperatingSystem.OPENBSD
+            || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64)
+            || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64);
+    }
+
     @Override
     public <K,V> Map<K, V> newMap(Class<K> keyType, Class<V> valueType) {
         return new RocksBigMapBuilder<K,V>()
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/RocksBigSetTest.java
@@ -16,12 +16,25 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.rocksdb.RocksBigSetBuilder;
+import com.fizzed.jne.HardwareArchitecture;
+import com.fizzed.jne.NativeTarget;
+import com.fizzed.jne.OperatingSystem;
+import org.junit.jupiter.api.condition.DisabledIf;
 
 import java.nio.file.Paths;
 import java.util.Set;
 
+@DisabledIf("isUnsupportedOs")
 public class RocksBigSetTest extends AbstractBigSetTest {
 
+    static public boolean isUnsupportedOs() {
+        final NativeTarget current = NativeTarget.detect();
+        return current.getOperatingSystem() == OperatingSystem.FREEBSD
+            || current.getOperatingSystem() == OperatingSystem.OPENBSD
+            || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64)
+            || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64);
+    }
+
     @Override
     public <V> Set<V> newSet(Class<V> valueType) {
         return new RocksBigSetBuilder<V>()
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedMapTest.java
@@ -16,10 +16,13 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.tkrzw.TkrzwBigLinkedMapBuilder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.nio.file.Paths;
 import java.util.Map;
 
+@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD })
 public class TkrzwBigLinkedMapTest extends AbstractBigLinkedMapTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigLinkedSetTest.java
@@ -16,10 +16,13 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.tkrzw.TkrzwBigLinkedSetBuilder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.nio.file.Paths;
 import java.util.Set;
 
+@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD })
 public class TkrzwBigLinkedSetTest extends AbstractBigLinkedSetTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigMapTest.java
@@ -16,10 +16,13 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.tkrzw.TkrzwBigMapBuilder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.nio.file.Paths;
 import java.util.Map;
 
+@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD })
 public class TkrzwBigMapTest extends AbstractBigMapTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TkrzwBigSetTest.java
@@ -16,10 +16,13 @@
 package com.fizzed.bigmap;
 
 import com.fizzed.bigmap.tkrzw.TkrzwBigSetBuilder;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.nio.file.Paths;
 import java.util.Set;
 
+@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD })
 public class TkrzwBigSetTest extends AbstractBigSetTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedMapTest.java
@@ -22,7 +22,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows")
+@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD })
 public class TokyoBigLinkedMapTest extends AbstractBigLinkedMapTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigLinkedSetTest.java
@@ -22,7 +22,7 @@
 import java.nio.file.Paths;
 import java.util.Set;
 
-@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows")
+@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD })
 public class TokyoBigLinkedSetTest extends AbstractBigLinkedSetTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigMapTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigMapTest.java
@@ -22,7 +22,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows")
+@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD })
 public class TokyoBigMapTest extends AbstractBigMapTest {
 
     @Override
diff --git a/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigSetTest.java b/bigmap-integration-tests/src/test/java/com/fizzed/bigmap/TokyoBigSetTest.java
@@ -22,7 +22,7 @@
 import java.nio.file.Paths;
 import java.util.Set;
 
-@DisabledOnOs(value=OS.WINDOWS, disabledReason="TokyoCabinet does not support windows")
+@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD })
 public class TokyoBigSetTest extends AbstractBigSetTest {
 
     @Override
diff --git a/bigmap-rocksdb/pom.xml b/bigmap-rocksdb/pom.xml
@@ -25,6 +25,12 @@
         
         <!-- testing -->
 
+        <dependency>
+            <groupId>com.fizzed</groupId>
+            <artifactId>jne</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>
diff --git a/bigmap-rocksdb/src/test/java/com/fizzed/bigmap/rocksdb/RocksBigMapTest.java b/bigmap-rocksdb/src/test/java/com/fizzed/bigmap/rocksdb/RocksBigMapTest.java
@@ -15,7 +15,13 @@
  */
 package com.fizzed.bigmap.rocksdb;
 
+import com.fizzed.jne.HardwareArchitecture;
+import com.fizzed.jne.NativeTarget;
+import com.fizzed.jne.OperatingSystem;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.nio.file.Paths;
 import java.util.Map;
@@ -24,8 +30,17 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
+@DisabledIf("isUnsupportedOs")
 public class RocksBigMapTest {
 
+    static public boolean isUnsupportedOs() {
+        final NativeTarget current = NativeTarget.detect();
+        return current.getOperatingSystem() == OperatingSystem.FREEBSD
+            || current.getOperatingSystem() == OperatingSystem.OPENBSD
+            || (current.getOperatingSystem() == OperatingSystem.WINDOWS && current.getHardwareArchitecture() == HardwareArchitecture.ARM64)
+            || (current.getOperatingSystem() == OperatingSystem.LINUX && current.getHardwareArchitecture() == HardwareArchitecture.RISCV64);
+    }
+
     @Test
     public void putGetWithStrings() {
         final Map<String,String> map = new RocksBigMapBuilder<String,String>()
diff --git a/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigMapTest.java b/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigMapTest.java
@@ -2,9 +2,8 @@
 
 import com.fizzed.bigmap.BigMap;
 import org.junit.jupiter.api.Test;
-import tkrzw.DBM;
-import tkrzw.Iterator;
-import tkrzw.Status;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -15,6 +14,7 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD })
 public class TkrzwBigMapTest {
 
     @Test
diff --git a/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigSetTest.java b/bigmap-tkrzw/src/test/java/com/fizzed/bigmap/tkrzw/TkrzwBigSetTest.java
@@ -1,10 +1,13 @@
 package com.fizzed.bigmap.tkrzw;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 import java.nio.file.Paths;
 import java.util.Set;
 
+@DisabledOnOs({ OS.FREEBSD, OS.OPENBSD })
 public class TkrzwBigSetTest {
 
     @Test
diff --git a/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigMapTest.java b/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigMapTest.java
@@ -15,7 +15,7 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-@DisabledOnOs(OS.WINDOWS)
+@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD })
 public class TokyoBigMapTest {
 
     @Test
diff --git a/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigSetTest.java b/bigmap-tokyocabinet/src/test/java/com/fizzed/bigmap/tokyocabinet/TokyoBigSetTest.java
@@ -7,7 +7,7 @@
 import java.nio.file.Paths;
 import java.util.Set;
 
-@DisabledOnOs(OS.WINDOWS)
+@DisabledOnOs({ OS.WINDOWS, OS.FREEBSD, OS.OPENBSD })
 public class TokyoBigSetTest {
 
     @Test
diff --git a/blaze.jar b/blaze.jar
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.fizzed</groupId>
         <artifactId>maven-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
     
     <properties>
@@ -126,7 +126,13 @@
             </dependency>
             
             <!-- testing -->
-            
+
+            <dependency>
+                <groupId>com.fizzed</groupId>
+                <artifactId>jne</artifactId>
+                <version>4.3.0</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.fizzed</groupId>
                 <artifactId>crux-util</artifactId>
@@ -148,7 +154,7 @@
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>5.8.1</version>
+                <version>5.10.3</version>
             </dependency>
             
             <dependency>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`blaze.dependencies = [`
	`2`	`+ "com.fizzed:blaze-ssh"`
	`3`	`+ "com.fizzed:buildx:1.0.7"`
`2`	`4`	`"com.fizzed:jne:4.1.1"`
`3`	`5`	`]`
`4`	`6`
-Original file line number
+Diff line change
 *.iml
 nb-configuration.xml
 .idea
 +.buildx