Skip to content

Commit

Permalink
windows fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jonmmease committed Aug 18, 2023
1 parent 899685c commit 5a87d85
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 10 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Expand Down

0 comments on commit 5a87d85

Please sign in to comment.