Skip to content

Fix 32-bit arm CI #2276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 3 additions & 49 deletions .github/workflows/arm-linux-gnueabihf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,35 +49,6 @@ jobs:
with:
key: ${{ matrix.os }}-arm-${{ matrix.lib_type }}

- name: cache-qemu
id: cache-qemu
uses: actions/cache@v4
with:
path: qemu-install
key: qemu-arm-install-20220907

- name: install-qemu-build-deps
if: steps.cache-qemu.outputs.cache-hit != 'true'
run: |
sudo apt-get update
sudo apt-get install autoconf automake autotools-dev ninja-build libglib2.0-dev.

- name: checkout-qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: qemu/qemu
path: qemu
ref: f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65

- name: qemu
if: steps.cache-qemu.outputs.cache-hit != 'true'
run: |
cd qemu
./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=arm-linux-user --disable-system
make -j2
make install

- name: cache-toolchain
id: cache-toolchain
uses: actions/cache@v4
Expand All @@ -103,13 +74,6 @@ jobs:
export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
arm-none-linux-gnueabihf-gcc --version

- name: Display qemu-arm -h
shell: bash
run: |
export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-none-linux-gnueabihf/libc
qemu-arm -h

- name: build arm-linux-gnueabihf
shell: bash
run: |
Expand All @@ -135,19 +99,6 @@ jobs:

file build-arm-linux-gnueabihf/bin/sherpa-onnx

- name: Test sherpa-onnx
shell: bash
run: |
export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
export PATH=$GITHUB_WORKSPACE/qemu-install/bin:$PATH
export QEMU_LD_PREFIX=$GITHUB_WORKSPACE/toolchain/arm-none-linux-gnueabihf/libc

ls -lh ./build-arm-linux-gnueabihf/bin

qemu-arm ./build-arm-linux-gnueabihf/bin/sherpa-onnx --help

readelf -d ./build-arm-linux-gnueabihf/bin/sherpa-onnx

- name: Copy files
shell: bash
run: |
Expand Down Expand Up @@ -228,3 +179,6 @@ jobs:
file_glob: true
overwrite: true
file: sherpa-onnx-*linux-arm-gnueabihf*.tar.bz2
# repo_name: k2-fsa/sherpa-onnx
# repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
# tag: v1.12.0
6 changes: 4 additions & 2 deletions .github/workflows/linux-jni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
file: ./*.jar
# repo_name: k2-fsa/sherpa-onnx
# repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
# tag: v1.11.1
# tag: v1.11.2

- name: Build sherpa-onnx
if: matrix.java-version == '23'
Expand Down Expand Up @@ -229,4 +229,6 @@ jobs:
file_glob: true
overwrite: true
file: sherpa-onnx-*.tar.bz2

# repo_name: k2-fsa/sherpa-onnx
# repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
# tag: v1.12.0
3 changes: 3 additions & 0 deletions .github/workflows/windows-x64-jni.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,6 @@ jobs:
file_glob: true
overwrite: true
file: sherpa-onnx-*.tar.bz2
# repo_name: k2-fsa/sherpa-onnx
# repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
# tag: v1.12.0
2 changes: 1 addition & 1 deletion build-aarch64-linux-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ cmake \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=ON \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \
Expand Down
2 changes: 1 addition & 1 deletion build-arm-linux-gnueabihf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ cmake \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=ON \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \
Expand Down
2 changes: 1 addition & 1 deletion build-rknn-linux-aarch64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ cmake \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=ON \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=ON \
Expand Down