xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
db632dac 1 parent 749dc9a2

Fix CI for windows (#2279)

内嵌 并排对比
正在显示 16 个修改的文件 包含 22 行增加 和 22 行删除
@@ -21,7 +21,7 @@ jobs: @@ -21,7 +21,7 @@ jobs:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 os: [ubuntu-22.04-arm] 23 os: [ubuntu-22.04-arm]
24 - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] 24 + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"]
25 manylinux: [manylinux2014] #, manylinux_2_28] 25 manylinux: [manylinux2014] #, manylinux_2_28]
26 26
27 steps: 27 steps:
@@ -23,7 +23,7 @@ jobs: @@ -23,7 +23,7 @@ jobs:
23 # see https://github.com/pypa/cibuildwheel/issues/2257 23 # see https://github.com/pypa/cibuildwheel/issues/2257
24 # we don't use qemu from now on 24 # we don't use qemu from now on
25 os: [ubuntu-22.04-arm] 25 os: [ubuntu-22.04-arm]
26 - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] 26 + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"]
27 manylinux: [manylinux2014] #, manylinux_2_28] 27 manylinux: [manylinux2014] #, manylinux_2_28]
28 28
29 steps: 29 steps:
@@ -21,7 +21,7 @@ jobs: @@ -21,7 +21,7 @@ jobs:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 os: [ubuntu-22.04] 23 os: [ubuntu-22.04]
24 - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] 24 + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"]
25 manylinux: [manylinux2014] #, manylinux_2_28] 25 manylinux: [manylinux2014] #, manylinux_2_28]
26 26
27 27
@@ -21,7 +21,7 @@ jobs: @@ -21,7 +21,7 @@ jobs:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 os: [macos-13] 23 os: [macos-13]
24 - python-version: ["cp37", "cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] 24 + python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"]
25 25
26 steps: 26 steps:
27 - uses: actions/checkout@v4 27 - uses: actions/checkout@v4
@@ -20,7 +20,7 @@ jobs: @@ -20,7 +20,7 @@ jobs:
20 strategy: 20 strategy:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 - os: [windows-2019] 23 + os: [windows-2022]
24 python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] 24 python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
25 25
26 steps: 26 steps:
@@ -20,7 +20,7 @@ jobs: @@ -20,7 +20,7 @@ jobs:
20 strategy: 20 strategy:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 - os: [windows-2019] 23 + os: [windows-2022]
24 python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] 24 python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
25 25
26 steps: 26 steps:
@@ -17,7 +17,7 @@ jobs: @@ -17,7 +17,7 @@ jobs:
17 strategy: 17 strategy:
18 fail-fast: false 18 fail-fast: false
19 matrix: 19 matrix:
20 - os: [windows-2019] 20 + os: [windows-2022]
21 arch: [x64, x86, arm64] 21 arch: [x64, x86, arm64]
22 22
23 steps: 23 steps:
@@ -20,7 +20,7 @@ jobs: @@ -20,7 +20,7 @@ jobs:
20 strategy: 20 strategy:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 - os: [windows-2019] 23 + os: [windows-2022]
24 python-version: ["3.8"] 24 python-version: ["3.8"]
25 25
26 steps: 26 steps:
@@ -20,7 +20,7 @@ jobs: @@ -20,7 +20,7 @@ jobs:
20 strategy: 20 strategy:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 - os: [windows-2019] 23 + os: [windows-2022]
24 python-version: ["3.8"] 24 python-version: ["3.8"]
25 25
26 steps: 26 steps:
@@ -218,7 +218,7 @@ jobs: @@ -218,7 +218,7 @@ jobs:
218 permissions: 218 permissions:
219 id-token: write # Required for authentication using OIDC 219 id-token: write # Required for authentication using OIDC
220 name: sherpa_onnx_windows 220 name: sherpa_onnx_windows
221 - runs-on: windows-2019 221 + runs-on: windows-2022
222 222
223 steps: 223 steps:
224 - uses: actions/checkout@v4 224 - uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs: @@ -25,7 +25,7 @@ jobs:
25 strategy: 25 strategy:
26 fail-fast: false 26 fail-fast: false
27 matrix: 27 matrix:
28 - os: [ubuntu-latest, macos-latest, windows-2019] 28 + os: [ubuntu-latest, macos-latest, windows-2022]
29 python-version: ["3.10"] 29 python-version: ["3.10"]
30 30
31 steps: 31 steps:
@@ -38,7 +38,7 @@ jobs: @@ -38,7 +38,7 @@ jobs:
38 strategy: 38 strategy:
39 fail-fast: false 39 fail-fast: false
40 matrix: 40 matrix:
41 - os: [ubuntu-latest] #, macos-latest] #, windows-2019] 41 + os: [ubuntu-latest] #, macos-latest] #, windows-2022]
42 python-version: ["3.8"] 42 python-version: ["3.8"]
43 43
44 steps: 44 steps:
@@ -60,11 +60,11 @@ jobs: @@ -60,11 +60,11 @@ jobs:
60 - os: macos-14 60 - os: macos-14
61 python-version: "3.13" 61 python-version: "3.13"
62 62
63 - - os: windows-2019 63 + - os: windows-2022
64 python-version: "3.7" 64 python-version: "3.7"
65 - - os: windows-2019 65 + - os: windows-2022
66 python-version: "3.8" 66 python-version: "3.8"
67 - - os: windows-2019 67 + - os: windows-2022
68 python-version: "3.9" 68 python-version: "3.9"
69 69
70 - os: windows-2022 70 - os: windows-2022
@@ -20,7 +20,7 @@ jobs: @@ -20,7 +20,7 @@ jobs:
20 strategy: 20 strategy:
21 fail-fast: false 21 fail-fast: false
22 matrix: 22 matrix:
23 - os: [windows-2019] 23 + os: [windows-2022]
24 24
25 steps: 25 steps:
26 - uses: actions/checkout@v4 26 - uses: actions/checkout@v4
@@ -26,10 +26,10 @@ pushd $src_dir @@ -26,10 +26,10 @@ pushd $src_dir
26 26
27 mkdir -p linux-x64 linux-arm64 macos-x64 macos-arm64 windows-x64 windows-x86 windows-arm64 27 mkdir -p linux-x64 linux-arm64 macos-x64 macos-arm64 windows-x64 windows-x86 windows-arm64
28 28
29 -linux_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 29 +linux_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
30 linux_x64_wheel=$src_dir/$linux_x64_wheel_filename 30 linux_x64_wheel=$src_dir/$linux_x64_wheel_filename
31 31
32 -linux_arm64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl 32 +linux_arm64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.whl
33 linux_arm64_wheel=$src_dir/$linux_arm64_wheel_filename 33 linux_arm64_wheel=$src_dir/$linux_arm64_wheel_filename
34 34
35 macos_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp39-cp39-macosx_11_0_x86_64.whl 35 macos_x64_wheel_filename=sherpa_onnx-${SHERPA_ONNX_VERSION}-cp39-cp39-macosx_11_0_x86_64.whl
@@ -28,8 +28,8 @@ function linux() { @@ -28,8 +28,8 @@ function linux() {
28 dst=$(realpath sherpa-onnx-go-linux/lib/x86_64-unknown-linux-gnu) 28 dst=$(realpath sherpa-onnx-go-linux/lib/x86_64-unknown-linux-gnu)
29 mkdir t 29 mkdir t
30 cd t 30 cd t
31 - 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  
32 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 31 + 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
  32 + unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl
33 33
34 cp -v sherpa_onnx/lib/*.so* $dst 34 cp -v sherpa_onnx/lib/*.so* $dst
35 35
@@ -40,8 +40,8 @@ function linux() { @@ -40,8 +40,8 @@ function linux() {
40 dst=$(realpath sherpa-onnx-go-linux/lib/aarch64-unknown-linux-gnu) 40 dst=$(realpath sherpa-onnx-go-linux/lib/aarch64-unknown-linux-gnu)
41 mkdir t 41 mkdir t
42 cd t 42 cd t
43 - 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  
44 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl 43 + 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
  44 + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.whl
45 45
46 cp -v sherpa_onnx/lib/*.so* $dst 46 cp -v sherpa_onnx/lib/*.so* $dst
47 47