ci: fix failing multi-arch

xerial · Apr 29, 2024 · db057a8 · db057a8
1 parent 662fb09
commit db057a8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,18 +94,18 @@ jobs:
           # ARM v7
           - arch: armv7
             distro: ubuntu_latest
-            java: 11 # apt-get maven is 3.6.x, doesn't support Java 17
+            java: 21
           # ARM 64
           - arch: aarch64
             distro: ubuntu_latest
-            java: 11 # apt-get maven is 3.6.x, doesn't support Java 17
+            java: 21
           - arch: aarch64
             distro: alpine_latest
-            java: 11
+            java: 21
           # PPC64
           - arch: ppc64le
             distro: ubuntu_latest
-            java: 11 # apt-get maven is 3.6.x, doesn't support Java 17
+            java: 21
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -143,12 +143,12 @@ jobs:
             --user 1001:121
 
           env: |
-            SKIP_TEST_OSINFO: true
+            SKIP_TEST_MULTIARCH: true
 
           run: |
             echo "Architecture: `uname -a`"
             mvn --version
-            cd /work && mvn --batch-mode --no-transfer-progress test
+            cd /work && mvn -Dmaven.repo.local=/work/.m2/repository --batch-mode --no-transfer-progress test
 
   # This will test the build process using an external amalgamation, as well as the
   # Java tests with that native library, as some functions will not be available (extensions).

diff --git a/src/test/java/org/sqlite/MultipleClassLoaderTest.java b/src/test/java/org/sqlite/MultipleClassLoaderTest.java
@@ -48,7 +48,12 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 
+@DisabledIfEnvironmentVariable(
+        named = "SKIP_TEST_MULTIARCH",
+        matches = "true",
+        disabledReason = "Those tests would fail when ran on a multi-arch image")
 public class MultipleClassLoaderTest {
 
     private Connection connection = null;

diff --git a/src/test/java/org/sqlite/util/OSInfoTest.java b/src/test/java/org/sqlite/util/OSInfoTest.java
@@ -24,7 +24,7 @@
 import org.junitpioneer.jupiter.SetSystemProperty;
 
 @DisabledIfEnvironmentVariable(
-        named = "SKIP_TEST_OSINFO",
+        named = "SKIP_TEST_MULTIARCH",
         matches = "true",
         disabledReason = "Those tests would fail when ran on a musl based Linux")
 @DisabledInNativeImage