From 4bbd26b614ffdafc63dbe0c578bdd69f7bc2e56e Mon Sep 17 00:00:00 2001 From: Andriy Plokhotnyuk Date: Tue, 30 Jun 2026 21:03:38 +0200 Subject: [PATCH 1/3] Update sbt to 2.0.1 --- project/build.properties | 2 +- .../eu/neverblink/jelly/cli/command/rdf/RdfToJellySpec.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project/build.properties b/project/build.properties index 144fdb6..c8a41b3 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.12.13 +sbt.version = 2.0.1 diff --git a/src/test/scala/eu/neverblink/jelly/cli/command/rdf/RdfToJellySpec.scala b/src/test/scala/eu/neverblink/jelly/cli/command/rdf/RdfToJellySpec.scala index c9aace6..6ce5b2a 100644 --- a/src/test/scala/eu/neverblink/jelly/cli/command/rdf/RdfToJellySpec.scala +++ b/src/test/scala/eu/neverblink/jelly/cli/command/rdf/RdfToJellySpec.scala @@ -101,7 +101,7 @@ class RdfToJellySpec extends AnyWordSpec with TestFixtureHelper with Matchers: } "input stream to output stream, generalized RDF (N-Triples)" in { - val inputStream = new FileInputStream(getClass.getResource("/generalized.nt").getPath) + val inputStream = getClass.getResourceAsStream("/generalized.nt") RdfToJelly.setStdIn(inputStream) val (out, err) = RdfToJelly.runTestCommand( List("rdf", "to-jelly", "--in-format=nt"), @@ -115,7 +115,7 @@ class RdfToJellySpec extends AnyWordSpec with TestFixtureHelper with Matchers: } "input stream to output stream, generalized RDF (N-Quads)" in { - val inputStream = new FileInputStream(getClass.getResource("/generalized.nq").getPath) + val inputStream = getClass.getResourceAsStream("/generalized.nq") RdfToJelly.setStdIn(inputStream) val (out, err) = RdfToJelly.runTestCommand( List("rdf", "to-jelly", "--in-format=nq"), From f385df9fe95a20f497273edf80c4e5f43b049461 Mon Sep 17 00:00:00 2001 From: Andriy Plokhotnyuk Date: Tue, 30 Jun 2026 22:41:52 +0200 Subject: [PATCH 2/3] Fix assembling and serial (non-parallel) testing --- .github/workflows/scala.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index d1e8fa7..93f8397 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -42,7 +42,7 @@ jobs: - name: Build and test shell: bash - run: sbt -v +test test-serial:test + run: sbt -v +test TestSerial/test test-assembly: runs-on: ubuntu-latest @@ -63,7 +63,7 @@ jobs: shell: bash run: | sbt -v assembly - mv target/scala-*/jelly-cli-assembly*.jar jelly-cli.jar + mv target/out/jvm/scala-*/jelly-cli/jelly-cli-assembly*.jar jelly-cli.jar - name: Test the assembly run: | From 4ed32f5a2a8cdc0d466aab3f1c566c0dbf003097 Mon Sep 17 00:00:00 2001 From: Andriy Plokhotnyuk Date: Wed, 1 Jul 2026 06:22:26 +0200 Subject: [PATCH 3/3] Fix binary checks and uploading --- .github/workflows/aot-test.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/aot-test.yml b/.github/workflows/aot-test.yml index 1a870f9..c7df48d 100644 --- a/.github/workflows/aot-test.yml +++ b/.github/workflows/aot-test.yml @@ -35,51 +35,53 @@ jobs: run: | set -euo pipefail + mv target/out/jvm/scala-*/jelly-cli/graalvm-native-image/jelly-cli jelly-cli + # See if it runs at all - target/graalvm-native-image/jelly-cli version || exit 1 + jelly-cli version || exit 1 # Make sure reflection is supported - target/graalvm-native-image/jelly-cli version | grep "JVM reflection: supported" \ + jelly-cli version | grep "JVM reflection: supported" \ || exit 1 # Make sure large RDF/XML file parsing is supported - target/graalvm-native-image/jelly-cli version | grep "Large RDF/XML file parsing: supported" \ + jelly-cli version | grep "Large RDF/XML file parsing: supported" \ || exit 1 # Test RDF conversions echo '_:b _:b .' > in.nt - target/graalvm-native-image/jelly-cli \ + jelly-cli \ rdf to-jelly --in-format=nt in.nt > out.jelly && \ [ -s out.jelly ] || exit 1 - target/graalvm-native-image/jelly-cli \ + jelly-cli \ rdf from-jelly --out-format=jelly-text out.jelly > out.txt && \ [ -s out.txt ] || exit 1 # From jelly-text - target/graalvm-native-image/jelly-cli \ + jelly-cli \ rdf to-jelly --in-format=jelly-text out.txt > out2.jelly && \ [ -s out2.jelly ] || exit 1 - target/graalvm-native-image/jelly-cli \ + jelly-cli \ rdf from-jelly --out-format=jsonld out.jelly > out.json && \ [ -s out.json ] || exit 1 echo '{"@graph":[{"@id":"http://e.org/r","http://e.org/p":{"@value":"v"}}]}' | \ - target/graalvm-native-image/jelly-cli rdf to-jelly --in-format "jsonld" > jsonld.jelly && \ + jelly-cli rdf to-jelly --in-format "jsonld" > jsonld.jelly && \ [ -s jsonld.jelly ] || exit 1 echo '' | \ - target/graalvm-native-image/jelly-cli rdf to-jelly --in-format "rdfxml" > rdfxml.jelly && \ + jelly-cli rdf to-jelly --in-format "rdfxml" > rdfxml.jelly && \ [ -s rdfxml.jelly ] || exit 1 # Invalid RDF/XMl input test # Regression test for: https://github.com/Jelly-RDF/cli/issues/217 echo 'invalidxml' | \ - ( ! target/graalvm-native-image/jelly-cli rdf to-jelly --in-format "rdfxml" &> error.txt ) && \ + ( ! jelly-cli rdf to-jelly --in-format "rdfxml" &> error.txt ) && \ grep 'Content is not allowed in prolog' error.txt || exit 1 # Test rdf validate - target/graalvm-native-image/jelly-cli \ + jelly-cli \ rdf validate out.jelly --compare-to-rdf-file in.nt || exit 1 - name: Upload binary uses: actions/upload-artifact@v4 with: name: jelly-cli-${{ matrix.os }} - path: target/graalvm-native-image/* + path: jelly-cli