xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
9539af5f 1 parent 1fabc6c7

Fix 32-bit arm CI (#2276)

内嵌 并排对比
正在显示 6 个修改的文件 包含 13 行增加 和 54 行删除
@@ -49,35 +49,6 @@ jobs: @@ -49,35 +49,6 @@ jobs:
49 with: 49 with:
50 key: ${{ matrix.os }}-arm-${{ matrix.lib_type }} 50 key: ${{ matrix.os }}-arm-${{ matrix.lib_type }}
51 51
52 - - name: cache-qemu  
53 - id: cache-qemu  
54 - uses: actions/cache@v4  
55 - with:  
56 - path: qemu-install  
57 - key: qemu-arm-install-20220907  
58 -  
59 - - name: install-qemu-build-deps  
60 - if: steps.cache-qemu.outputs.cache-hit != 'true'  
61 - run: |  
62 - sudo apt-get update  
63 - sudo apt-get install autoconf automake autotools-dev ninja-build libglib2.0-dev.  
64 -  
65 - - name: checkout-qemu  
66 - if: steps.cache-qemu.outputs.cache-hit != 'true'  
67 - uses: actions/checkout@v3  
68 - with:  
69 - repository: qemu/qemu  
70 - path: qemu  
71 - ref: f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65  
72 -  
73 - - name: qemu  
74 - if: steps.cache-qemu.outputs.cache-hit != 'true'  
75 - run: |  
76 - cd qemu  
77 - ./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=arm-linux-user --disable-system  
78 - make -j2  
79 - make install  
80 -  
81 - name: cache-toolchain 52 - name: cache-toolchain
82 id: cache-toolchain 53 id: cache-toolchain
83 uses: actions/cache@v4 54 uses: actions/cache@v4
@@ -103,13 +74,6 @@ jobs: @@ -103,13 +74,6 @@ jobs:
103 export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH 74 export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
104 arm-none-linux-gnueabihf-gcc --version 75 arm-none-linux-gnueabihf-gcc --version
105 76
106 - - name: Display qemu-arm -h  
107 - shell: bash  
108 - run: |  
109 - export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH  
110 - export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-none-linux-gnueabihf/libc  
111 - qemu-arm -h  
112 -  
113 - name: build arm-linux-gnueabihf 77 - name: build arm-linux-gnueabihf
114 shell: bash 78 shell: bash
115 run: | 79 run: |
@@ -135,19 +99,6 @@ jobs: @@ -135,19 +99,6 @@ jobs:
135 99
136 file build-arm-linux-gnueabihf/bin/sherpa-onnx 100 file build-arm-linux-gnueabihf/bin/sherpa-onnx
137 101
138 - - name: Test sherpa-onnx  
139 - shell: bash  
140 - run: |  
141 - export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH  
142 - export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH  
143 - export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-none-linux-gnueabihf/libc  
144 -  
145 - ls -lh ./build-arm-linux-gnueabihf/bin  
146 -  
147 - qemu-arm ./build-arm-linux-gnueabihf/bin/sherpa-onnx --help  
148 -  
149 - readelf -d ./build-arm-linux-gnueabihf/bin/sherpa-onnx  
150 -  
151 - name: Copy files 102 - name: Copy files
152 shell: bash 103 shell: bash
153 run: | 104 run: |
@@ -228,3 +179,6 @@ jobs: @@ -228,3 +179,6 @@ jobs:
228 file_glob: true 179 file_glob: true
229 overwrite: true 180 overwrite: true
230 file: sherpa-onnx-*linux-arm-gnueabihf*.tar.bz2 181 file: sherpa-onnx-*linux-arm-gnueabihf*.tar.bz2
  182 + # repo_name: k2-fsa/sherpa-onnx
  183 + # repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
  184 + # tag: v1.12.0
@@ -76,7 +76,7 @@ jobs: @@ -76,7 +76,7 @@ jobs:
76 file: ./*.jar 76 file: ./*.jar
77 # repo_name: k2-fsa/sherpa-onnx 77 # repo_name: k2-fsa/sherpa-onnx
78 # repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }} 78 # repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
79 - # tag: v1.11.1 79 + # tag: v1.11.2
80 80
81 - name: Build sherpa-onnx 81 - name: Build sherpa-onnx
82 if: matrix.java-version == '23' 82 if: matrix.java-version == '23'
@@ -229,4 +229,6 @@ jobs: @@ -229,4 +229,6 @@ jobs:
229 file_glob: true 229 file_glob: true
230 overwrite: true 230 overwrite: true
231 file: sherpa-onnx-*.tar.bz2 231 file: sherpa-onnx-*.tar.bz2
232 - 232 + # repo_name: k2-fsa/sherpa-onnx
  233 + # repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
  234 + # tag: v1.12.0
@@ -122,3 +122,6 @@ jobs: @@ -122,3 +122,6 @@ jobs:
122 file_glob: true 122 file_glob: true
123 overwrite: true 123 overwrite: true
124 file: sherpa-onnx-*.tar.bz2 124 file: sherpa-onnx-*.tar.bz2
  125 + # repo_name: k2-fsa/sherpa-onnx
  126 + # repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
  127 + # tag: v1.12.0
@@ -106,7 +106,7 @@ cmake \ @@ -106,7 +106,7 @@ cmake \
106 -DSHERPA_ONNX_ENABLE_TESTS=OFF \ 106 -DSHERPA_ONNX_ENABLE_TESTS=OFF \
107 -DSHERPA_ONNX_ENABLE_PYTHON=OFF \ 107 -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
108 -DSHERPA_ONNX_ENABLE_CHECK=OFF \ 108 -DSHERPA_ONNX_ENABLE_CHECK=OFF \
109 - -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \ 109 + -DSHERPA_ONNX_ENABLE_PORTAUDIO=ON \
110 -DSHERPA_ONNX_ENABLE_JNI=OFF \ 110 -DSHERPA_ONNX_ENABLE_JNI=OFF \
111 -DSHERPA_ONNX_ENABLE_C_API=ON \ 111 -DSHERPA_ONNX_ENABLE_C_API=ON \
112 -DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \ 112 -DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \
@@ -50,7 +50,7 @@ cmake \ @@ -50,7 +50,7 @@ cmake \
50 -DSHERPA_ONNX_ENABLE_TESTS=OFF \ 50 -DSHERPA_ONNX_ENABLE_TESTS=OFF \
51 -DSHERPA_ONNX_ENABLE_PYTHON=OFF \ 51 -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
52 -DSHERPA_ONNX_ENABLE_CHECK=OFF \ 52 -DSHERPA_ONNX_ENABLE_CHECK=OFF \
53 - -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \ 53 + -DSHERPA_ONNX_ENABLE_PORTAUDIO=ON \
54 -DSHERPA_ONNX_ENABLE_JNI=OFF \ 54 -DSHERPA_ONNX_ENABLE_JNI=OFF \
55 -DSHERPA_ONNX_ENABLE_C_API=ON \ 55 -DSHERPA_ONNX_ENABLE_C_API=ON \
56 -DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \ 56 -DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \
@@ -83,7 +83,7 @@ cmake \ @@ -83,7 +83,7 @@ cmake \
83 -DSHERPA_ONNX_ENABLE_TESTS=OFF \ 83 -DSHERPA_ONNX_ENABLE_TESTS=OFF \
84 -DSHERPA_ONNX_ENABLE_PYTHON=OFF \ 84 -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
85 -DSHERPA_ONNX_ENABLE_CHECK=OFF \ 85 -DSHERPA_ONNX_ENABLE_CHECK=OFF \
86 - -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \ 86 + -DSHERPA_ONNX_ENABLE_PORTAUDIO=ON \
87 -DSHERPA_ONNX_ENABLE_JNI=OFF \ 87 -DSHERPA_ONNX_ENABLE_JNI=OFF \
88 -DSHERPA_ONNX_ENABLE_C_API=ON \ 88 -DSHERPA_ONNX_ENABLE_C_API=ON \
89 -DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \ 89 -DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \