From 13f60fe1f38b7bbdb337c7cd733b3839d066cea1 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Fri, 23 Feb 2024 09:42:11 +0800
Subject: [PATCH 1/2] Publish pre-built android libs

---
 .github/workflows/android.yaml | 143 +++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 .github/workflows/android.yaml

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
new file mode 100644
index 00000000..5b56a6a9
--- /dev/null
+++ b/.github/workflows/android.yaml
@@ -0,0 +1,143 @@
+name: android
+
+on:
+  push:
+    branches:
+      - master
+      - android
+    paths:
+      - '.github/workflows/android.yaml'
+      - 'CMakeLists.txt'
+      - 'cmake/**'
+      - 'sherpa-ncnn/csrc/*'
+      - 'sherpa-ncnn/jni/*'
+      - 'build-android*.sh'
+    tags:
+      - '*'
+  pull_request:
+    branches:
+      - master
+    paths:
+      - '.github/workflows/android.yaml'
+      - 'CMakeLists.txt'
+      - 'cmake/**'
+      - 'sherpa-ncnn/csrc/*'
+      - 'sherpa-ncnn/jni/*'
+      - 'build-android*.sh'
+
+  workflow_dispatch:
+    inputs:
+      release:
+        description: "Whether to release"
+        type: boolean
+
+env:
+  RELEASE:
+    |- # Release if there is a release tag name or a release flag in workflow_dispatch
+    ${{ github.event.release.tag_name != '' || github.event.inputs.release == 'true' }}
+
+concurrency:
+  group: android-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-android-libs:
+    name: Android for ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Display NDK HOME
+        shell: bash
+        run: |
+          echo "ANDROID_NDK_LATEST_HOME: ${ANDROID_NDK_LATEST_HOME}"
+          ls -lh ${ANDROID_NDK_LATEST_HOME}
+
+      - name: build android arm64-v8a
+        shell: bash
+        run: |
+          export ANDROID_NDK=$ANDROID_NDK_LATEST_HOME
+          ./build-android-arm64-v8a.sh
+          mkdir -p jniLibs/arm64-v8a/
+          cp -v ./build-android-arm64-v8a/install/lib/*.so ./jniLibs/arm64-v8a/
+
+      - name: build android armv7-eabi
+        shell: bash
+        run: |
+          export ANDROID_NDK=$ANDROID_NDK_LATEST_HOME
+          ./build-android-armv7-eabi.sh
+          mkdir -p ./jniLibs/armeabi-v7a/
+          cp -v ./build-android-armv7-eabi/install/lib/*.so ./jniLibs/armeabi-v7a/
+
+      - name: build android x86_64
+        shell: bash
+        run: |
+          export ANDROID_NDK=$ANDROID_NDK_LATEST_HOME
+          ./build-android-x86-64.sh
+          mkdir -p ./jniLibs/x86_64
+          cp -v ./build-android-x86-64/install/lib/*.so ./jniLibs/x86_64
+
+      - name: build android x86
+        shell: bash
+        run: |
+          export ANDROID_NDK=$ANDROID_NDK_LATEST_HOME
+          ./build-android-x86.sh
+          mkdir -p ./jniLibs/x86
+          cp -v ./build-android-x86/install/lib/*.so ./jniLibs/x86
+
+      - name: Copy files
+        shell: bash
+        run: |
+          SHERPA_NCNN_VERSION=v$(grep "SHERPA_NCNN_VERSION" ./CMakeLists.txt  | cut -d " " -f 2  | cut -d '"' -f 2)
+          echo "SHERPA_NCNN_VERSION=$SHERPA_NCNN_VERSION" >> "$GITHUB_ENV"
+
+          filename=sherpa-ncnn-${SHERPA_NCNN_VERSION}-android.tar.bz2
+
+          tar cjvf $filename ./jniLibs
+
+          ls -lh
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: sherpa-ncnn-android-libs
+          path: ./jniLibs
+
+      # https://huggingface.co/docs/hub/spaces-github-actions
+      - name: Publish to huggingface
+        if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' && github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN }}
+        run: |
+          git config --global user.email "csukuangfj@gmail.com"
+          git config --global user.name "Fangjun Kuang"
+
+          GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/sherpa-ncnn-libs huggingface
+
+          cd huggingface
+          git lfs pull
+
+          cp -v ../sherpa-ncnn-*-android.tar.bz2 ./
+
+          git status
+          git lfs track "*.bz2"
+
+          git add .
+
+          git commit -m "upload sherpa-ncnn-${SHERPA_NCNN_VERSION}-android.tar.bz2"
+
+          git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-ncnn-libs main
+
+      - name: Release android libs
+        if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa' && github.event_name == 'push' && contains(github.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          file_glob: true
+          overwrite: true
+          file: sherpa-ncnn-*-android.tar.bz2

From d633eb0c4b70d0f54b82075a6bbfc58e2e8f64d9 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Fri, 23 Feb 2024 09:56:55 +0800
Subject: [PATCH 2/2] Release v2.1.8

---
 .github/workflows/android.yaml | 1 -
 CMakeLists.txt                 | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
index 5b56a6a9..8711a3b6 100644
--- a/.github/workflows/android.yaml
+++ b/.github/workflows/android.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - android
     paths:
       - '.github/workflows/android.yaml'
       - 'CMakeLists.txt'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7c6f1c4..bf4d4358 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(sherpa-ncnn)
 
-set(SHERPA_NCNN_VERSION "2.1.7")
+set(SHERPA_NCNN_VERSION "2.1.8")
 
 # Disable warning about
 #