diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6803b681e..39913066f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -29,8 +29,8 @@ jobs: strategy: matrix: platform: - - { os: linux, runner: ubuntu-22.04, target: aarch64 } - - { os: macos, runner: macos-14, target: aarch64 } + - { os: linux, runner: ubuntu-24.04, target: aarch64, container: "ghcr.io/rust-cross/manylinux_2_28-cross:aarch64" } + - { os: macos, runner: macos-15, target: aarch64 } steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 @@ -42,4 +42,5 @@ jobs: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter sccache: 'true' - manylinux: auto \ No newline at end of file + manylinux: auto + container: ${{ matrix.platform.container }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44c46e660..829a0076f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,12 +31,12 @@ jobs: strategy: matrix: platform: - - { os: linux, runner: ubuntu-22.04, target: x86_64 } - - { os: linux, runner: ubuntu-22.04, target: aarch64 } - - { os: linux, runner: ubuntu-22.04, target: armv7 } - - { os: musllinux, runner: ubuntu-22.04, target: x86_64 } - - { os: musllinux, runner: ubuntu-22.04, target: aarch64 } - - { os: musllinux, runner: ubuntu-22.04, target: armv7 } + - { os: linux, runner: ubuntu-24.04, target: x86_64, container: "quay.io/pypa/manylinux_2_28_x86_64:latest" } + - { os: linux, runner: ubuntu-24.04, target: aarch64, container: "ghcr.io/rust-cross/manylinux_2_28-cross:aarch64" } + - { os: linux, runner: ubuntu-24.04, target: armv7, container: "ghcr.io/rust-cross/manylinux_2_28-cross:armv7" } + - { os: musllinux, runner: ubuntu-24.04, target: x86_64, container: "off" } + - { os: musllinux, runner: ubuntu-24.04, target: aarch64, container: "off" } + - { os: musllinux, runner: ubuntu-24.04, target: armv7, container: "off" } - { os: windows, runner: windows-latest, target: x64 } - { os: macos, runner: macos-13, target: x86_64 } - { os: macos, runner: macos-14, target: aarch64 } @@ -55,6 +55,7 @@ jobs: args: --release --out dist --find-interpreter sccache: 'true' manylinux: auto + container: ${{ matrix.platform.container }} - name: Upload wheels uses: actions/upload-artifact@v4 with: diff --git a/Cargo.toml b/Cargo.toml index 8a902365f..e1be453bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,3 +43,4 @@ pythonize = "0.23.0" # TODO: Switch to a stable tag of mistralrs after a new release is tagged. mistralrs = { git = "https://github.com/EricLBuehler/mistral.rs.git" } schemars = "0.8.22" +openssl = { version = "0.10.71", features = ["vendored"] }