diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 518aa643..79e341ce 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -75,7 +75,7 @@ jobs: iwr -useb https://pixi.sh/install.ps1 | iex echo "${HOME}/AppData/Local/pixi/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Test Java - run: pixi run test-java + run: pixi run test-java-win - name: Copy native lib run: | mkdir -p native/win-64 diff --git a/pixi.toml b/pixi.toml index 26942838..f301e76d 100644 --- a/pixi.toml +++ b/pixi.toml @@ -47,15 +47,24 @@ build-rs-vegafusion-server = { cmd = "cargo build -p vegafusion-server --release # Java build-jni = "cargo build -p vegafusion-jni --release $0" build-jar = "export VEGAFUSION_JNI_LIBRARIES=$1 && cd java && ./gradlew jar" +build-jar-win = "export VEGAFUSION_JNI_LIBRARIES=$1 && cd java && ./gradlew.bat jar" [tasks.test-java] cmd = """ -export VEGAFUSION_JNI_LIBRARY=$(python automation/find_file.py $PIXI_PACKAGE_ROOT/target/release/ \"libvegafusion_jni\\.(so|dylib|dll)$\") && +export VEGAFUSION_JNI_LIBRARY=$(python automation/find_file.py $PIXI_PACKAGE_ROOT/target/release/ \"libvegafusion_jni\\.(so|dylib)$\") && cd java && ./gradlew test $0 """ depends_on = ["build-jni"] +[tasks.test-java-win] +cmd = """ +export VEGAFUSION_JNI_LIBRARY=$PIXI_PACKAGE_ROOT/target/release/vegafusion_jni.dll && +cd java && +./gradlew.bat test $0 +""" +depends_on = ["build-jni"] + # Build dependencies are those required to build and test all packages [build-dependencies] python = "3.10.*"