Skip to content

Commit

Permalink
Revert maturin distribution manylinux version change
Browse files Browse the repository at this point in the history
Let's wait for 1.64.0 to do this.
  • Loading branch information
messense committed Aug 14, 2022
1 parent 1e92e60 commit 243c5e5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Build wheel (with sdist)
if: matrix.target == 'x86_64-unknown-linux-musl'
run: |
cargo run -- build --release -b bin --sdist -o dist --target ${{ matrix.target }} --features password-storage --compatibility manylinux2014 musllinux_1_1
cargo run -- build --release -b bin --sdist -o dist --target ${{ matrix.target }} --features password-storage --compatibility manylinux2010 musllinux_1_1
# ring doesn't support aarch64 windows yet
- name: Build wheel (windows aarch64)
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
platform: [
{ target: "aarch64-unknown-linux-musl", image_tag: "aarch64-musl", manylinux: "2014" },
{ target: "armv7-unknown-linux-musleabihf", image_tag: "armv7-musleabihf", manylinux: "2014"},
{ target: "i686-unknown-linux-musl", image_tag: "i686-musl", manylinux: "2014"},
{ target: "i686-unknown-linux-musl", image_tag: "i686-musl", manylinux: "2010"},
]
container:
image: docker://messense/rust-musl-cross:${{ matrix.platform.image_tag }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/pypa/manylinux2014_x86_64 as builder
FROM quay.io/pypa/manylinux2010_x86_64 as builder

ENV PATH /root/.cargo/bin:$PATH

Expand All @@ -24,7 +24,7 @@ RUN cargo rustc --bin maturin --manifest-path /maturin/Cargo.toml --release --fe
&& mv /maturin/target/release/maturin /usr/bin/maturin \
&& rm -rf /maturin

FROM quay.io/pypa/manylinux2014_x86_64
FROM quay.io/pypa/manylinux2010_x86_64

ENV PATH /root/.cargo/bin:$PATH
# Add all supported python versions
Expand Down

0 comments on commit 243c5e5

Please sign in to comment.