diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml index cb5024b81..50225e860 100644 --- a/.github/workflows/build-binaries.yml +++ b/.github/workflows/build-binaries.yml @@ -275,26 +275,20 @@ jobs: *.tar.gz *.sha256 + # TODO(charlie): Re-enable s390x-unknown-linux-gnu, powerpc64le-unknown-linux-gnu, and powerpc64-unknown-linux-gnu. + # s390x-unknown-linux-gnu works if we disable zlib-ng. The others fail in mysterious ways. linux-cross: - # TODO(charlie): Enable cross-compilation. - if: false runs-on: ubuntu-latest strategy: matrix: platform: - target: aarch64-unknown-linux-gnu arch: aarch64 - # see https://github.com/astral-sh/puffin/issues/3791 + # see https://github.com/astral-sh/ruff/issues/3791 # and https://github.com/gnzlbg/jemallocator/issues/170#issuecomment-1503228963 maturin_docker_options: -e JEMALLOC_SYS_WITH_LG_PAGE=16 - target: armv7-unknown-linux-gnueabihf arch: armv7 - - target: s390x-unknown-linux-gnu - arch: s390x - - target: powerpc64le-unknown-linux-gnu - arch: ppc64le - - target: powerpc64-unknown-linux-gnu - arch: ppc64 steps: - uses: actions/checkout@v4 @@ -309,7 +303,7 @@ jobs: uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - manylinux: auto + manylinux: 2_28 docker-options: ${{ matrix.platform.maturin_docker_options }} args: --release --locked --out dist - uses: uraimo/run-on-arch-action@v2 diff --git a/Cargo.toml b/Cargo.toml index 7fef22965..6bf010b6d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -152,7 +152,7 @@ windows-archive = ".zip" # The archive format to use for non-windows builds (defaults .tar.xz) unix-archive = ".tar.gz" # Target platforms to build apps for (Rust target-triple syntax) -targets = ["aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl", "i686-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu"] +targets = ["aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu", "aarch64-apple-darwin", "x86_64-apple-darwin", "aarch64-unknown-linux-musl", "x86_64-unknown-linux-musl", "i686-unknown-linux-musl", "aarch64-pc-windows-msvc", "x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf"] # Whether to auto-include files like READMEs and CHANGELOGs (default true) auto-includes = false # Whether cargo-dist should create a Github Release or use an existing draft