Fangjun Kuang
Committed by GitHub

Fix CI (#485)

@@ -46,7 +46,7 @@ jobs: @@ -46,7 +46,7 @@ jobs:
46 echo "PWD" 46 echo "PWD"
47 ls -lh /project/alsa-lib/src/.libs 47 ls -lh /project/alsa-lib/src/.libs
48 48
49 - CIBW_ENVIRONMENT: CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_INCLUDE_PATH SHERPA_ONNX_ALSA_LIB_DIR=/project/alsa-lib/src/.libs LD_LIBRARY_PATH=/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib:$SHERPA_ONNX_ALSA_LIB_DIR SHERPA_ONNX_MAKE_ARGS="VERBOSE=1" 49 + CIBW_ENVIRONMENT: CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_INCLUDE_PATH SHERPA_ONNX_ALSA_LIB_DIR=/project/alsa-lib/src/.libs LD_LIBRARY_PATH=/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib:$SHERPA_ONNX_ALSA_LIB_DIR SHERPA_ONNX_MAKE_ARGS="VERBOSE=1" SHERPA_ONNX_ENABLE_ALSA=1
50 CIBW_BUILD: "${{ matrix.python-version}}-* " 50 CIBW_BUILD: "${{ matrix.python-version}}-* "
51 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686" 51 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686"
52 CIBW_BUILD_VERBOSITY: 3 52 CIBW_BUILD_VERBOSITY: 3
@@ -41,7 +41,7 @@ jobs: @@ -41,7 +41,7 @@ jobs:
41 echo "PWD" 41 echo "PWD"
42 ls -lh /project/alsa-lib/src/.libs 42 ls -lh /project/alsa-lib/src/.libs
43 43
44 - CIBW_ENVIRONMENT: CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_INCLUDE_PATH SHERPA_ONNX_ALSA_LIB_DIR=/project/alsa-lib/src/.libs LD_LIBRARY_PATH=/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib:$SHERPA_ONNX_ALSA_LIB_DIR SHERPA_ONNX_MAKE_ARGS="VERBOSE=1" 44 + CIBW_ENVIRONMENT: CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_INCLUDE_PATH SHERPA_ONNX_ALSA_LIB_DIR=/project/alsa-lib/src/.libs LD_LIBRARY_PATH=/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib:$SHERPA_ONNX_ALSA_LIB_DIR SHERPA_ONNX_MAKE_ARGS="VERBOSE=1" SHERPA_ONNX_ENABLE_ALSA=1
45 45
46 CIBW_BUILD: "${{ matrix.python-version}}-* " 46 CIBW_BUILD: "${{ matrix.python-version}}-* "
47 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686" 47 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686"
@@ -38,6 +38,11 @@ def is_x86(): @@ -38,6 +38,11 @@ def is_x86():
38 return platform.machine() in ["i386", "i686", "x86_64"] 38 return platform.machine() in ["i386", "i686", "x86_64"]
39 39
40 40
  41 +def enable_alsa():
  42 + build_alsa = os.environ.get("SHERPA_ONNX_ENABLE_ALSA", None)
  43 + return build_alsa and is_linux() and (is_arm64() or is_x86())
  44 +
  45 +
41 try: 46 try:
42 from wheel.bdist_wheel import bdist_wheel as _bdist_wheel 47 from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
43 48
@@ -157,7 +162,7 @@ class BuildExtension(build_ext): @@ -157,7 +162,7 @@ class BuildExtension(build_ext):
157 binaries += ["sherpa-onnx-offline-tts"] 162 binaries += ["sherpa-onnx-offline-tts"]
158 binaries += ["sherpa-onnx-offline-tts-play"] 163 binaries += ["sherpa-onnx-offline-tts-play"]
159 164
160 - if is_linux() and (is_arm64() or is_x86()): 165 + if enable_alsa():
161 binaries += ["sherpa-onnx-alsa"] 166 binaries += ["sherpa-onnx-alsa"]
162 binaries += ["sherpa-onnx-offline-tts-play-alsa"] 167 binaries += ["sherpa-onnx-offline-tts-play-alsa"]
163 168
@@ -11,10 +11,8 @@ from cmake.cmake_extension import ( @@ -11,10 +11,8 @@ from cmake.cmake_extension import (
11 BuildExtension, 11 BuildExtension,
12 bdist_wheel, 12 bdist_wheel,
13 cmake_extension, 13 cmake_extension,
  14 + enable_alsa,
14 is_windows, 15 is_windows,
15 - is_linux,  
16 - is_arm64,  
17 - is_x86,  
18 ) 16 )
19 17
20 18
@@ -64,7 +62,7 @@ def get_binaries_to_install(): @@ -64,7 +62,7 @@ def get_binaries_to_install():
64 binaries += ["sherpa-onnx-offline-tts"] 62 binaries += ["sherpa-onnx-offline-tts"]
65 binaries += ["sherpa-onnx-offline-tts-play"] 63 binaries += ["sherpa-onnx-offline-tts-play"]
66 64
67 - if is_linux() and (is_arm64() or is_x86()): 65 + if enable_alsa():
68 binaries += ["sherpa-onnx-alsa"] 66 binaries += ["sherpa-onnx-alsa"]
69 binaries += ["sherpa-onnx-offline-tts-play-alsa"] 67 binaries += ["sherpa-onnx-offline-tts-play-alsa"]
70 68