From 5f1094e7cb865b1a985aa30035c2c519da60e843 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Tue, 3 Jun 2025 20:45:40 +0800
Subject: [PATCH] Fix 32-bit arm CI

---
 .github/workflows/arm-linux-gnueabihf.yaml | 52 ++--------------------
 .github/workflows/linux-jni.yaml           |  6 ++-
 .github/workflows/windows-x64-jni.yaml     |  3 ++
 build-aarch64-linux-gnu.sh                 |  2 +-
 build-arm-linux-gnueabihf.sh               |  2 +-
 build-rknn-linux-aarch64.sh                |  2 +-
 6 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml
index 6b1aa5c479..d1d394c9f7 100644
--- a/.github/workflows/arm-linux-gnueabihf.yaml
+++ b/.github/workflows/arm-linux-gnueabihf.yaml
@@ -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
@@ -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: |
@@ -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: |
@@ -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
diff --git a/.github/workflows/linux-jni.yaml b/.github/workflows/linux-jni.yaml
index a9ca7a94fa..a04b8cff32 100644
--- a/.github/workflows/linux-jni.yaml
+++ b/.github/workflows/linux-jni.yaml
@@ -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'
@@ -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
diff --git a/.github/workflows/windows-x64-jni.yaml b/.github/workflows/windows-x64-jni.yaml
index 99cecf152c..b94d059598 100644
--- a/.github/workflows/windows-x64-jni.yaml
+++ b/.github/workflows/windows-x64-jni.yaml
@@ -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
diff --git a/build-aarch64-linux-gnu.sh b/build-aarch64-linux-gnu.sh
index 350c3d2799..764e1c31a1 100755
--- a/build-aarch64-linux-gnu.sh
+++ b/build-aarch64-linux-gnu.sh
@@ -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 \
diff --git a/build-arm-linux-gnueabihf.sh b/build-arm-linux-gnueabihf.sh
index 3e4ce38a55..0d4efc17f8 100755
--- a/build-arm-linux-gnueabihf.sh
+++ b/build-arm-linux-gnueabihf.sh
@@ -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 \
diff --git a/build-rknn-linux-aarch64.sh b/build-rknn-linux-aarch64.sh
index bf664aa896..01f37de86d 100755
--- a/build-rknn-linux-aarch64.sh
+++ b/build-rknn-linux-aarch64.sh
@@ -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 \