Refactor CI

k2-fsa · Mar 21, 2024 · 718d185 · 718d185
1 parent c8770ae
commit 718d185
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 62 deletions.
diff --git a/.github/workflows/aarch64-linux-gnu-shared.yaml b/.github/workflows/aarch64-linux-gnu-shared.yaml
@@ -12,6 +12,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/aarch64-linux-gnu.toolchain.cmake'
   pull_request:
     branches:
@@ -21,6 +22,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/aarch64-linux-gnu.toolchain.cmake'
 
   workflow_dispatch:

diff --git a/.github/workflows/aarch64-linux-gnu-static.yaml b/.github/workflows/aarch64-linux-gnu-static.yaml
@@ -12,6 +12,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/aarch64-linux-gnu.toolchain.cmake'
   pull_request:
     branches:
@@ -21,6 +22,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/aarch64-linux-gnu.toolchain.cmake'
 
   workflow_dispatch:

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -25,15 +25,6 @@ on:
       - '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 }}

diff --git a/.github/workflows/apk-kws.yaml b/.github/workflows/apk-kws.yaml
@@ -2,8 +2,6 @@ name: apk-kws
 
 on:
   push:
-    branches:
-      - apk-kws
     tags:
       - '*'
 
@@ -17,7 +15,7 @@ permissions:
   contents: write
 
 jobs:
-  apk:
+  apk_kws:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

diff --git a/.github/workflows/apk-speaker-identification.yaml b/.github/workflows/apk-speaker-identification.yaml
@@ -2,8 +2,6 @@ name: apk-speaker-identification
 
 on:
   push:
-    branches:
-      - apk
     tags:
       - '*'
 
@@ -17,7 +15,7 @@ permissions:
   contents: write
 
 jobs:
-  apk_tts:
+  apk_speaker_identification:
     if: github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa'
     runs-on: ${{ matrix.os }}
     name: apk for tts ${{ matrix.index }}/${{ matrix.total }}
@@ -84,18 +82,7 @@ jobs:
           ls -lh ./apks/
           du -h -d1 .
 
-      # - name: Release
-      #   uses: svenstaro/upload-release-action@v2
-      #   with:
-      #     file_glob: true
-      #     file: ./apks/*.apk
-      #     overwrite: true
-      #     repo_name: k2-fsa/sherpa-onnx
-      #     repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
-      #     tag: speaker-recongition-models
-
       - name: Publish to huggingface
-        if: true
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/apk-tts-engine.yaml b/.github/workflows/apk-tts-engine.yaml
@@ -2,8 +2,6 @@ name: apk-tts-engine
 
 on:
   push:
-    branches:
-      - apk-tts
     tags:
       - '*'
 

diff --git a/.github/workflows/apk-tts.yaml b/.github/workflows/apk-tts.yaml
@@ -2,9 +2,6 @@ name: apk-tts
 
 on:
   push:
-    branches:
-      - apk-tts
-      - apk
     tags:
       - '*'
 

diff --git a/.github/workflows/apk.yaml b/.github/workflows/apk.yaml
@@ -2,8 +2,6 @@ name: apk
 
 on:
   push:
-    branches:
-      - apk
     tags:
       - '*'
 

diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml
@@ -10,6 +10,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/arm-linux-gnueabihf.toolchain.cmake'
     tags:
       - '*'
@@ -21,6 +22,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/arm-linux-gnueabihf.toolchain.cmake'
 
   workflow_dispatch:

diff --git a/.github/workflows/build-wheels-aarch64.yaml b/.github/workflows/build-wheels-aarch64.yaml
@@ -2,8 +2,6 @@ name: build-wheels-aarch64
 
 on:
   push:
-    branches:
-      - wheel
     tags:
       - '*'
   workflow_dispatch:
@@ -61,10 +59,8 @@ jobs:
         run: |
           ls -lh ./wheelhouse/
 
-          ls -lh ./wheelhouse/*.whl
-
       - name: Publish to huggingface
-        if: matrix.python-version == 'cp38' && matrix.manylinux == 'manylinux_2_28'
+        if: matrix.python-version == 'cp38' && matrix.manylinux == 'manylinux2014'
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         uses: nick-fields/retry@v3

diff --git a/.github/workflows/build-wheels-armv7l.yaml b/.github/workflows/build-wheels-armv7l.yaml
@@ -2,8 +2,6 @@ name: build-wheels-armv7l
 
 on:
   push:
-    branches:
-      - wheel
     tags:
       - '*'
   workflow_dispatch:

diff --git a/.github/workflows/build-wheels-linux.yaml b/.github/workflows/build-wheels-linux.yaml
@@ -2,8 +2,6 @@ name: build-wheels-linux
 
 on:
   push:
-    branches:
-      - wheel
     tags:
       - '*'
   workflow_dispatch:
@@ -12,7 +10,7 @@ env:
   SHERPA_ONNX_IS_IN_GITHUB_ACTIONS: 1
 
 concurrency:
-  group: build-wheels-${{ github.ref }}
+  group: build-wheels-linux-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -84,6 +82,7 @@ jobs:
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         uses: nick-fields/retry@v3
+        shell: bash
         with:
           max_attempts: 20
           timeout_seconds: 200
@@ -112,23 +111,25 @@ jobs:
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        shell: bash
         run: |
           python3 -m pip install --upgrade pip
           python3 -m pip install wheel twine setuptools
 
           twine upload ./wheelhouse/*.whl
 
       - name: Build sdist
-        if: matrix.python-version == 'cp38' && matrix.manylinux == 'manylinux_2_28'
+        if: matrix.python-version == 'cp38' && matrix.manylinux == 'manylinux2014'
         shell: bash
         run: |
           python3 setup.py sdist
           ls -l dist/*
 
       - name: Publish sdist to PyPI
-        if: matrix.python-version == 'cp38' && matrix.manylinux == 'manylinux_2_28'
+        if: matrix.python-version == 'cp38' && matrix.manylinux == 'manylinux2014'
         env:
           TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        shell: bash
         run: |
           twine upload dist/sherpa-onnx-*.tar.gz
diff --git a/.github/workflows/build-wheels-macos-arm64.yaml b/.github/workflows/build-wheels-macos-arm64.yaml
@@ -2,8 +2,6 @@ name: build-wheels-macos-arm64
 
 on:
   push:
-    branches:
-      - wheel
     tags:
       - '*'
   workflow_dispatch:
@@ -16,7 +14,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_wheels:
+  build_wheels_macos_arm64:
     name: ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -34,6 +32,7 @@ jobs:
         if: matrix.python-version == 'cp37'
         uses: pypa/[email protected]
         env:
+          CIBW_BUILD: "${{ matrix.python-version}}-* "
           CIBW_ENVIRONMENT: SHERPA_ONNX_CMAKE_ARGS="-DCMAKE_OSX_ARCHITECTURES='arm64'"
           CIBW_ARCHS: "arm64"
           CIBW_BUILD_VERBOSITY: 3
@@ -58,8 +57,6 @@ jobs:
         run: |
           ls -lh ./wheelhouse/
 
-          ls -lh ./wheelhouse/*.whl
-
       - uses: actions/upload-artifact@v4
         with:
           name: wheel-${{ matrix.python-version }}

diff --git a/.github/workflows/build-wheels-macos-x64.yaml b/.github/workflows/build-wheels-macos-x64.yaml
@@ -16,7 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_wheels:
+  build_wheels_macos_x64:
     name: ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -41,6 +41,7 @@ jobs:
 
           #  Don't repair macOS wheels
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
+
       - name: Build wheels
         if: matrix.python-version != 'cp37'
         uses: pypa/[email protected]

diff --git a/.github/workflows/build-wheels-win32.yaml b/.github/workflows/build-wheels-win32.yaml
@@ -2,8 +2,6 @@ name: build-wheels-win32
 
 on:
   push:
-    branches:
-      - wheel
     tags:
       - '*'
   workflow_dispatch:

diff --git a/.github/workflows/build-wheels-win64.yaml b/.github/workflows/build-wheels-win64.yaml
@@ -42,8 +42,6 @@ jobs:
         run: |
           ls -lh ./wheelhouse/
 
-          ls -lh ./wheelhouse/*.whl
-
       - uses: actions/upload-artifact@v4
         with:
           name: wheel-${{ matrix.python-version }}

diff --git a/.github/workflows/build-xcframework.yaml b/.github/workflows/build-xcframework.yaml
@@ -4,11 +4,25 @@ on:
   push:
     branches:
       - master
-      - xcframework
     paths:
       - './build-ios.sh'
+      - '.github/workflows/build-xcframework.yaml'
+      - 'CMakeLists.txt'
+      - 'cmake/**'
+      - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
     tags:
       - '*'
+  pull_request:
+    branches:
+      - master
+    paths:
+      - './build-ios.sh'
+      - '.github/workflows/build-xcframework.yaml'
+      - 'CMakeLists.txt'
+      - 'cmake/**'
+      - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
 
   workflow_dispatch:
 

diff --git a/.github/workflows/mfc.yaml b/.github/workflows/mfc.yaml
@@ -12,6 +12,7 @@ on:
       - 'cmake/**'
       - 'mfc-examples/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
   pull_request:
     branches:
       - master
@@ -21,6 +22,7 @@ on:
       - 'cmake/**'
       - 'mfc-examples/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
 
   workflow_dispatch:
 

diff --git a/.github/workflows/riscv64-linux.yaml b/.github/workflows/riscv64-linux.yaml
@@ -9,6 +9,7 @@ on:
       - 'CMakeLists.txt'
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
       - 'toolchains/riscv64-linux-gnu.toolchain.cmake'
       - 'build-riscv64-linux-gnu.sh'
     tags:
@@ -22,6 +23,7 @@ on:
       - 'cmake/**'
       - 'sherpa-onnx/csrc/*'
       - 'toolchains/riscv64-linux-gnu.toolchain.cmake'
+      - 'sherpa-onnx/c-api/*'
       - 'build-riscv64-linux-gnu.sh'
 
   workflow_dispatch:

diff --git a/.github/workflows/run-python-test.yaml b/.github/workflows/run-python-test.yaml
@@ -36,8 +36,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest] # windows-latest]
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.7", "3.8", "3.9", "3.10","3.11", "3.12"]
         exclude:
           - os: macos-latest
             python-version: "3.9"

diff --git a/.github/workflows/swift.yaml b/.github/workflows/swift.yaml
@@ -4,10 +4,28 @@ on:
   push:
     branches:
       - master
+    paths:
+      - './build-swift-macos.sh'
+      - '.github/workflows/swift.yaml'
+      - 'CMakeLists.txt'
+      - 'cmake/**'
+      - 'swift-api-examples/**'
+      - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
+      - '.github/scripts/test-swift.sh'
 
   pull_request:
     branches:
       - master
+    paths:
+      - './build-swift-macos.sh'
+      - '.github/workflows/swift.yaml'
+      - 'CMakeLists.txt'
+      - 'cmake/**'
+      - 'swift-api-examples/**'
+      - 'sherpa-onnx/csrc/*'
+      - 'sherpa-onnx/c-api/*'
+      - '.github/scripts/test-swift.sh'
 
   workflow_dispatch: