test macos arm64

k2-fsa · Apr 25, 2024 · 284a25a · 284a25a
1 parent 7b2a3a5
commit 284a25a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/.github/workflows/jni.yaml b/.github/workflows/jni.yaml
@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-latest, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -49,6 +49,11 @@ jobs:
         with:
           key: ${{ matrix.os }}
 
+      - name: OS info
+        shell: bash
+        run: |
+          uname -a
+
       - name: Display kotlin version
         shell: bash
         run: |
@@ -58,6 +63,7 @@ jobs:
         shell: bash
         run: |
           java -version
+          javac -help
           echo "JAVA_HOME is: ${JAVA_HOME}"
 
       - name:  Run JNI test

diff --git a/.github/workflows/run-java-test.yaml b/.github/workflows/run-java-test.yaml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, macos-latest, macos-14]
 
     steps:
       - uses: actions/checkout@v4
@@ -50,10 +50,24 @@ jobs:
         with:
           key: ${{ matrix.os }}-java
 
+      - name: OS info
+        shell: bash
+        run: |
+          uname -a
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '21'
+
       - name: Display java version
         shell: bash
         run: |
           java -version
+          java -help
+          echo "----"
+          javac -version
+          javac -help
           echo "JAVA_HOME is: ${JAVA_HOME}"
 
           cmake --version

diff --git a/sherpa-onnx/java-api/Makefile b/sherpa-onnx/java-api/Makefile
@@ -44,10 +44,12 @@ $(info -- class files $(class_files))
 all: $(out_jar)
 
 $(out_jar): $(class_files)
-	jar --create --verbose --file $(out_jar) -C $(out_dir) .
+	# jar --create --verbose --file $(out_jar) -C $(out_dir) ./
+	jar cvf $(out_jar) -C $(out_dir) ./
 
 clean:
 	$(RM) -rfv $(out_dir)
 
 $(class_files): $(out_dir)/$(package_dir)/%.class: src/$(package_dir)/%.java
-	javac -d $(out_dir) --class-path $(out_dir) $<
+	mkdir -p build
+	javac -d $(out_dir) -cp $(out_dir) $<
diff --git a/sherpa-onnx/jni/wave-reader.cc b/sherpa-onnx/jni/wave-reader.cc
@@ -6,6 +6,7 @@
 #include <fstream>
 
 #include "sherpa-onnx/csrc/macros.h"
+#include "sherpa-onnx/csrc/onnx-utils.h"
 #include "sherpa-onnx/jni/common.h"
 
 static jobjectArray ReadWaveImpl(JNIEnv *env, std::istream &is,