From db632dacf31c8d81663e2efe419e8de7a9c35e13 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Wed, 4 Jun 2025 10:35:48 +0800 Subject: [PATCH] Fix CI for windows (#2279) --- .github/workflows/build-wheels-aarch64-cuda.yaml | 2 +- .github/workflows/build-wheels-aarch64.yaml | 2 +- .github/workflows/build-wheels-linux.yaml | 2 +- .github/workflows/build-wheels-macos-x64.yaml | 2 +- .github/workflows/build-wheels-win64-cuda.yaml | 2 +- .github/workflows/build-wheels-win64.yaml | 2 +- .github/workflows/dot-net.yaml | 2 +- .github/workflows/npm-addon-win-x64.yaml | 2 +- .github/workflows/npm-addon-win-x86.yaml | 2 +- .github/workflows/release-dart-package.yaml | 2 +- .github/workflows/test-nodejs-npm.yaml | 2 +- .github/workflows/test-nodejs.yaml | 2 +- .github/workflows/test-pip-install.yaml | 6 +++--- .github/workflows/windows-x64-jni.yaml | 2 +- scripts/dotnet/run.sh | 4 ++-- scripts/go/release.sh | 8 ++++---- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-wheels-aarch64-cuda.yaml b/.github/workflows/build-wheels-aarch64-cuda.yaml index 6069679e..24f1c219 100644 --- a/.github/workflows/build-wheels-aarch64-cuda.yaml +++ b/.github/workflows/build-wheels-aarch64-cuda.yaml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04-arm] - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] manylinux: [manylinux2014] #, manylinux_2_28] steps: diff --git a/.github/workflows/build-wheels-aarch64.yaml b/.github/workflows/build-wheels-aarch64.yaml index 18bd871a..a9035462 100644 --- a/.github/workflows/build-wheels-aarch64.yaml +++ b/.github/workflows/build-wheels-aarch64.yaml @@ -23,7 +23,7 @@ jobs: # see https://github.com/pypa/cibuildwheel/issues/2257 # we don't use qemu from now on os: [ubuntu-22.04-arm] - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] manylinux: [manylinux2014] #, manylinux_2_28] steps: diff --git a/.github/workflows/build-wheels-linux.yaml b/.github/workflows/build-wheels-linux.yaml index 93d97990..a360a355 100644 --- a/.github/workflows/build-wheels-linux.yaml +++ b/.github/workflows/build-wheels-linux.yaml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-22.04] - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] manylinux: [manylinux2014] #, manylinux_2_28] diff --git a/.github/workflows/build-wheels-macos-x64.yaml b/.github/workflows/build-wheels-macos-x64.yaml index 89ea4788..9894fd1c 100644 --- a/.github/workflows/build-wheels-macos-x64.yaml +++ b/.github/workflows/build-wheels-macos-x64.yaml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [macos-13] - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/build-wheels-win64-cuda.yaml b/.github/workflows/build-wheels-win64-cuda.yaml index 27b4fb87..612f25e8 100644 --- a/.github/workflows/build-wheels-win64-cuda.yaml +++ b/.github/workflows/build-wheels-win64-cuda.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019] + os: [windows-2022] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] steps: diff --git a/.github/workflows/build-wheels-win64.yaml b/.github/workflows/build-wheels-win64.yaml index 5a80e535..88358921 100644 --- a/.github/workflows/build-wheels-win64.yaml +++ b/.github/workflows/build-wheels-win64.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019] + os: [windows-2022] python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] steps: diff --git a/.github/workflows/dot-net.yaml b/.github/workflows/dot-net.yaml index 54fcdc16..06f10c27 100644 --- a/.github/workflows/dot-net.yaml +++ b/.github/workflows/dot-net.yaml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019] + os: [windows-2022] arch: [x64, x86, arm64] steps: diff --git a/.github/workflows/npm-addon-win-x64.yaml b/.github/workflows/npm-addon-win-x64.yaml index d9150b23..333ed3e9 100644 --- a/.github/workflows/npm-addon-win-x64.yaml +++ b/.github/workflows/npm-addon-win-x64.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019] + os: [windows-2022] python-version: ["3.8"] steps: diff --git a/.github/workflows/npm-addon-win-x86.yaml b/.github/workflows/npm-addon-win-x86.yaml index bf098341..f997381c 100644 --- a/.github/workflows/npm-addon-win-x86.yaml +++ b/.github/workflows/npm-addon-win-x86.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019] + os: [windows-2022] python-version: ["3.8"] steps: diff --git a/.github/workflows/release-dart-package.yaml b/.github/workflows/release-dart-package.yaml index cc830e2c..ef56e933 100644 --- a/.github/workflows/release-dart-package.yaml +++ b/.github/workflows/release-dart-package.yaml @@ -218,7 +218,7 @@ jobs: permissions: id-token: write # Required for authentication using OIDC name: sherpa_onnx_windows - runs-on: windows-2019 + runs-on: windows-2022 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test-nodejs-npm.yaml b/.github/workflows/test-nodejs-npm.yaml index e1358fd8..92f32b34 100644 --- a/.github/workflows/test-nodejs-npm.yaml +++ b/.github/workflows/test-nodejs-npm.yaml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-2019] + os: [ubuntu-latest, macos-latest, windows-2022] python-version: ["3.10"] steps: diff --git a/.github/workflows/test-nodejs.yaml b/.github/workflows/test-nodejs.yaml index 78788ad0..e2f7075a 100644 --- a/.github/workflows/test-nodejs.yaml +++ b/.github/workflows/test-nodejs.yaml @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] #, macos-latest] #, windows-2019] + os: [ubuntu-latest] #, macos-latest] #, windows-2022] python-version: ["3.8"] steps: diff --git a/.github/workflows/test-pip-install.yaml b/.github/workflows/test-pip-install.yaml index 9780e175..2879c42b 100644 --- a/.github/workflows/test-pip-install.yaml +++ b/.github/workflows/test-pip-install.yaml @@ -60,11 +60,11 @@ jobs: - os: macos-14 python-version: "3.13" - - os: windows-2019 + - os: windows-2022 python-version: "3.7" - - os: windows-2019 + - os: windows-2022 python-version: "3.8" - - os: windows-2019 + - os: windows-2022 python-version: "3.9" - os: windows-2022 diff --git a/.github/workflows/windows-x64-jni.yaml b/.github/workflows/windows-x64-jni.yaml index b94d0595..85d3ad7f 100644 --- a/.github/workflows/windows-x64-jni.yaml +++ b/.github/workflows/windows-x64-jni.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019] + os: [windows-2022] steps: - uses: actions/checkout@v4 diff --git a/scripts/dotnet/run.sh b/scripts/dotnet/run.sh index dd525546..29c53bde 100755 --- a/scripts/dotnet/run.sh +++ b/scripts/dotnet/run.sh @@ -26,10 +26,10 @@ pushd $src_dir mkdir -p linux-x64 linux-arm64 macos-x64 macos-arm64 windows-x64 windows-x86 windows-arm64 -linux_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl +linux_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl linux_x64_wheel=$src_dir/$linux_x64_wheel_filename -linux_arm64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl +linux_arm64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.whl linux_arm64_wheel=$src_dir/$linux_arm64_wheel_filename macos_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp39-cp39-macosx_11_0_x86_64.whl diff --git a/scripts/go/release.sh b/scripts/go/release.sh index 60ffd91c..6d76e046 100755 --- a/scripts/go/release.sh +++ b/scripts/go/release.sh @@ -28,8 +28,8 @@ function linux() { dst=$(realpath sherpa-onnx-go-linux/lib/x86_64-unknown-linux-gnu) mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/cpu/$SHERPA_ONNX_VERSION/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/cpu/$SHERPA_ONNX_VERSION/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl + unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl cp -v sherpa_onnx/lib/*.so* $dst @@ -40,8 +40,8 @@ function linux() { dst=$(realpath sherpa-onnx-go-linux/lib/aarch64-unknown-linux-gnu) mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/cpu/$SHERPA_ONNX_VERSION/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/cpu/$SHERPA_ONNX_VERSION/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.whl + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.whl cp -v sherpa_onnx/lib/*.so* $dst