small fixes

k2-fsa · Oct 20, 2023 · d4b7643 · d4b7643
1 parent 42e0669
commit d4b7643
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 16 deletions.
diff --git a/.github/workflows/aarch64-linux-gnu.yaml b/.github/workflows/aarch64-linux-gnu.yaml
@@ -147,7 +147,7 @@ jobs:
 
           tar cjvf ${dst}.tar.bz2 $dst
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: sherpa-onnx-*linux-aarch64.tar.bz2
 

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -103,7 +103,7 @@ jobs:
 
           ls -lh
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: sherpa-onnx-android-libs
           path: ./jniLibs

diff --git a/.github/workflows/apk.yaml b/.github/workflows/apk.yaml
@@ -47,7 +47,7 @@ jobs:
         run: |
           ls -lh ./apks/
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./apks/*.apk
 

diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml
@@ -140,7 +140,7 @@ jobs:
 
           tar cjvf ${dst}.tar.bz2 $dst
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: sherpa-onnx-*linux-arm-gnueabihf.tar.bz2
 

diff --git a/.github/workflows/build-wheels-aarch64.yaml b/.github/workflows/build-wheels-aarch64.yaml
@@ -49,7 +49,7 @@ jobs:
 
           ls -lh ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 

diff --git a/.github/workflows/build-wheels-macos.yaml b/.github/workflows/build-wheels-macos.yaml
@@ -47,7 +47,7 @@ jobs:
 
           ls -lh ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 

diff --git a/.github/workflows/build-wheels-win32.yaml b/.github/workflows/build-wheels-win32.yaml
@@ -44,7 +44,7 @@ jobs:
 
           ls -lh ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 

diff --git a/.github/workflows/build-wheels.yaml b/.github/workflows/build-wheels.yaml
@@ -61,7 +61,7 @@ jobs:
           rm -rf ./wheelhouse
           mv ./wheels ./wheelhouse
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: ./wheelhouse/*.whl
 

diff --git a/.github/workflows/build-xcframework.yaml b/.github/workflows/build-xcframework.yaml
@@ -57,7 +57,7 @@ jobs:
 
           ls -lh
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: sherpa-onnx-ios-libs
           path: ./build-ios

diff --git a/.github/workflows/dot-net.yaml b/.github/workflows/dot-net.yaml
@@ -42,7 +42,7 @@ jobs:
           ls -lh ./wheelhouse/*.whl
           unzip -l ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}-wheels
           path: ./wheelhouse/*.whl
@@ -119,7 +119,7 @@ jobs:
           ./run.sh
           ls -lh packages
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         name: upload nuget packages
         with:
           name: nuget-packages

diff --git a/.github/workflows/mfc.yaml b/.github/workflows/mfc.yaml
@@ -90,13 +90,13 @@ jobs:
           ls -lh
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: streaming-speech-recognition-${{ matrix.arch }}
           path: ./mfc-examples/${{ matrix.arch }}/Release/StreamingSpeechRecognition.exe
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: non-streaming-speech-recognition-${{ matrix.arch }}
           path: ./mfc-examples/${{ matrix.arch }}/Release/NonStreamingSpeechRecognition.exe

diff --git a/.github/workflows/release-go.yaml b/.github/workflows/release-go.yaml
@@ -58,7 +58,7 @@ jobs:
           ls -lh ./wheelhouse/*.whl
           unzip -l ./wheelhouse/*.whl
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}-wheels-for-go
           path: ./wheelhouse/*.whl
@@ -74,16 +74,28 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ matrix.os }}-${{ matrix.arch }}
+
       - name: Configure CMake
         shell: bash
         run: |
+          export CMAKE_CXX_COMPILER_LAUNCHER=ccache
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          cmake --version
+
           mkdir build
           cd build
           cmake -D CMAKE_BUILD_TYPE=${{ matrix.build_type }} -D BUILD_SHARED_LIBS=ON -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DCMAKE_INSTALL_PREFIX=./install ..
 
       - name: Build sherpa-onnx for macOS ${{ matrix.arch }}
         shell: bash
         run: |
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+
           cd build
           make -j2
           make install
@@ -93,7 +105,7 @@ jobs:
 
           file install/lib/lib*
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.os }}-for-${{ matrix.arch }}
           path: ./build/install/lib/
@@ -131,7 +143,7 @@ jobs:
           ls -lh install/bin
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: sherpa-onnx-go-windows-${{ matrix.arch }}
           path: ./build/install/lib/