Add Ubuntu 24.04 to Docker tests (#142)

* Add Ubuntu 24.04 to Docker tests

* Don't obscure underlying cause of invalid library path exception

* Bump to 1.5.2

Author: lopcode

README.md

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation("app.photofox.vips-ffm:vips-ffm-core:1.5.1")
+    implementation("app.photofox.vips-ffm:vips-ffm-core:1.5.2")
 }
 ```
 When running your project you must add `--enable-native-access=ALL-UNNAMED` to your JVM runtime arguments. If you

core/src/main/java/app/photofox/vipsffm/VipsLibLookup.java

@@ -101,17 +101,18 @@ private static Optional<SymbolLookup> makeOptionalLibraryLookup(String libraryNa
             try {
                 symbolLookup = SymbolLookup.libraryLookup(Path.of(path), arena);
             } catch (IllegalArgumentException exception) {
-                throw makeOverriddenPathMissingException(libraryName, path);
+                throw makeLibraryAtPathNotValidException(libraryName, path, exception);
             }
             return symbolLookup;
         });
     }
 
-    private static IllegalArgumentException makeOverriddenPathMissingException(
+    private static IllegalArgumentException makeLibraryAtPathNotValidException(
         String libraryName,
-        String overridePath
+        String overridePath,
+        Throwable cause
     ) {
-        var message = "path override requested for %s, but library not found at path: %s".formatted(libraryName, overridePath);
-        return new IllegalArgumentException(message);
+        var message = "path override requested for %s, but library not valid at path: %s".formatted(libraryName, overridePath);
+        return new IllegalArgumentException(message, cause);
     }
 }

docker_tests/.gitignore

@@ -1,2 +1,2 @@
 */sample/*
-*/sample/run_samples.sh
+*/run_samples.sh

docker_tests/debian-12/Dockerfile

@@ -7,6 +7,7 @@ COPY sample /opt/sample
 COPY run_samples.sh /opt/run_samples.sh
 
 RUN apt update && apt install libvips-dev -y
+RUN vips --version
 
 WORKDIR /opt
 CMD ./run_samples.sh

docker_tests/ubuntu-2404/Dockerfile

@@ -0,0 +1,13 @@
+FROM ubuntu:24.04
+ENV JAVA_HOME=/opt/java/openjdk
+COPY --from=eclipse-temurin:22 $JAVA_HOME $JAVA_HOME
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+COPY sample /opt/sample
+COPY run_samples.sh /opt/run_samples.sh
+
+RUN apt update && apt install libvips-dev -y
+RUN vips --version
+
+WORKDIR /opt
+CMD ./run_samples.sh

docs/index.html

@@ -70,7 +70,7 @@ <h2 id="usage-heading">Usage</h2>
 }
 
 dependencies {
-    implementation(&quot;app.photofox.vips-ffm:vips-ffm-core:1.5.1&quot;)
+    implementation(&quot;app.photofox.vips-ffm:vips-ffm-core:1.5.2&quot;)
 }
 </code></pre>
 <p>When running your project you must add <code>--enable-native-access=ALL-UNNAMED</code> to your JVM runtime arguments. If you

run_docker_tests.sh

@@ -7,9 +7,13 @@ echo "building samples..."
 echo "running docker tests..."
 WORKSPACE_DIR="$PWD"
 
-pushd docker_tests/debian-12
-cp -r "$WORKSPACE_DIR"/sample .
-cp "$WORKSPACE_DIR"/run_samples.sh .
-docker build -t vips-ffm-debian-test .
-docker run vips-ffm-debian-test
-popd
+docker_tests=("debian-12" "ubuntu-2404")
+for docker_test in "${docker_tests[@]}"; do
+  echo "testing \"$docker_test\""
+  pushd "docker_tests/$docker_test"
+  cp -r "$WORKSPACE_DIR"/sample .
+  cp "$WORKSPACE_DIR"/run_samples.sh .
+  docker build -t "vips-ffm-$docker_test-test" .
+  docker run "vips-ffm-$docker_test-test"
+  popd
+done