xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
e7b73481 1 parent 2db77758

fix detecting node-addon packages (#908)

内嵌 并排对比
正在显示 4 个修改的文件 包含 11 行增加 和 9 行删除
@@ -18,7 +18,7 @@ fi @@ -18,7 +18,7 @@ fi
18 SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2) 18 SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
19 echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION" 19 echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION"
20 20
21 -# SHERPA_ONNX_VERSION=1.0.24 21 +# SHERPA_ONNX_VERSION=1.0.25
22 22
23 if [ -z $owner ]; then 23 if [ -z $owner ]; then
24 owner=k2-fsa 24 owner=k2-fsa
@@ -55,7 +55,7 @@ jobs: @@ -55,7 +55,7 @@ jobs:
55 55
56 SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2) 56 SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
57 echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION" 57 echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION"
58 - # SHERPA_ONNX_VERSION=1.0.24 58 + # SHERPA_ONNX_VERSION=1.0.25
59 59
60 src_dir=.github/scripts/node-addon 60 src_dir=.github/scripts/node-addon
61 sed -i.bak s/SHERPA_ONNX_VERSION/$SHERPA_ONNX_VERSION/g $src_dir/package.json 61 sed -i.bak s/SHERPA_ONNX_VERSION/$SHERPA_ONNX_VERSION/g $src_dir/package.json
1 { 1 {
2 "dependencies": { 2 "dependencies": {
3 - "sherpa-onnx-node": "^1.0.24" 3 + "sherpa-onnx-node": "^1.0.25"
4 } 4 }
5 } 5 }
@@ -27,9 +27,10 @@ for (const p of possible_paths) { @@ -27,9 +27,10 @@ for (const p of possible_paths) {
27 if (!found) { 27 if (!found) {
28 let msg = `Could not find sherpa-onnx-node. Tried\n\n ${ 28 let msg = `Could not find sherpa-onnx-node. Tried\n\n ${
29 possible_paths.join('\n ')}\n` 29 possible_paths.join('\n ')}\n`
30 - if (os.platform() == 'darwin' && process.env.DYLD_LIBRARY_PATH &&  
31 - !process.env.DYLD_LIBRARY_PATH.includes(  
32 - `node_modules/sherpa-onnx-${platform_arch}`)) { 30 + if (os.platform() == 'darwin' &&
  31 + (!process.env.DYLD_LIBRARY_PATH ||
  32 + !process.env.DYLD_LIBRARY_PATH.includes(
  33 + `node_modules/sherpa-onnx-${platform_arch}`))) {
33 msg += 34 msg +=
34 'Please remeber to set the following environment variable and try again:\n'; 35 'Please remeber to set the following environment variable and try again:\n';
35 36
@@ -39,9 +40,10 @@ if (!found) { @@ -39,9 +40,10 @@ if (!found) {
39 msg += ':$DYLD_LIBRARY_PATH\n'; 40 msg += ':$DYLD_LIBRARY_PATH\n';
40 } 41 }
41 42
42 - if (os.platform() == 'linux' && process.env.LD_LIBRARY_PATH &&  
43 - !process.env.LD_LIBRARY_PATH.includes(  
44 - `node_modules/sherpa-onnx-${platform_arch}`)) { 43 + if (os.platform() == 'linux' &&
  44 + (!process.env.LD_LIBRARY_PATH ||
  45 + !process.env.LD_LIBRARY_PATH.includes(
  46 + `node_modules/sherpa-onnx-${platform_arch}`))) {
45 msg += 47 msg +=
46 'Please remeber to set the following environment variable and try again:\n'; 48 'Please remeber to set the following environment variable and try again:\n';
47 49