Skip to content

Commit

Permalink
Upgrade ring to 0.17 (#1819)
Browse files Browse the repository at this point in the history
* Upgrade ring to 0.17

* Apply suggestions from code review

* Update release.yml
  • Loading branch information
messense authored Oct 26, 2023
1 parent a0d53b3 commit c138d63
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 156 deletions.
60 changes: 14 additions & 46 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,64 +154,33 @@ jobs:
matrix:
platform:
- target: "aarch64-unknown-linux-musl"
image_tag: "aarch64-musl"
image: "rust-musl-cross:aarch64-musl"
compatibility: "manylinux2014 musllinux_1_1"
- target: "armv7-unknown-linux-musleabihf"
image_tag: "armv7-musleabihf"
image: "rust-musl-cross:armv7-musleabihf"
compatibility: "manylinux2014 musllinux_1_1"
- target: "i686-unknown-linux-musl"
image_tag: "i686-musl"
image: "rust-musl-cross:i686-musl"
compatibility: "manylinux2010 musllinux_1_1"
- target: "arm-unknown-linux-musleabihf"
image_tag: "arm-musleabihf"
image: "rust-musl-cross:arm-musleabihf"
compatibility: "linux"
container:
image: docker://ghcr.io/messense/rust-musl-cross:${{ matrix.platform.image_tag }}
env:
RUSTUP_HOME: /root/.rustup
CARGO_HOME: /root/.cargo
steps:
- uses: actions/checkout@v4
- name: Build wheel
run: |
sudo python3 -m pip install -U --pre maturin
maturin build --release -b bin -o dist \
--target ${{ matrix.platform.target }} \
--compatibility ${{ matrix.platform.compatibility }} \
--features password-storage
- name: Archive binary
run: tar czvf target/release/maturin-${{ matrix.platform.target }}.tar.gz -C target/${{ matrix.platform.target }}/release maturin
- name: Upload wheel artifacts
uses: actions/upload-artifact@v3
with:
name: wheels
path: dist
- name: Upload binary artifacts
uses: actions/upload-artifact@v3
with:
name: binaries
path: target/release/maturin-${{ matrix.platform.target }}.tar.gz

build-no-rustls:
name: Build ${{ matrix.platform.target }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
platform:
- target: "powerpc64le-unknown-linux-musl"
image: "ghcr.io/messense/rust-musl-cross:powerpc64le-musl"
image: "rust-musl-cross:powerpc64le-musl"
compatibility: "manylinux2014 musllinux_1_1"
- target: "s390x-unknown-linux-gnu"
image: "ghcr.io/messense/manylinux2014-cross:s390x"
image: "manylinux2014-cross:s390x"
compatibility: "manylinux2014"
container:
image: docker://${{ matrix.platform.image }}
image: docker://ghcr.io/rust-cross/${{ matrix.platform.image }}
env:
RUSTUP_HOME: /root/.rustup
CARGO_HOME: /root/.cargo
steps:
- uses: actions/checkout@v4
# powerpc64le-unknown-linux-musl doesn't have official std library release
- uses: dtolnay/rust-toolchain@stable
if: matrix.platform.target == 's390x-unknown-linux-gnu'
if: matrix.platform.target != 'powerpc64le-unknown-linux-musl'
with:
targets: ${{ matrix.platform.target }}
- name: Build wheel
Expand All @@ -223,8 +192,7 @@ jobs:
maturin build --release -b bin -o dist \
--target ${{ matrix.platform.target }} \
--compatibility ${{ matrix.platform.compatibility }} \
--no-default-features \
--features full,password-storage
--features password-storage
- name: Archive binary
run: tar czvf target/release/maturin-${{ matrix.platform.target }}.tar.gz -C target/${{ matrix.platform.target }}/release maturin
- name: Upload wheel artifacts
Expand All @@ -251,7 +219,7 @@ jobs:
name: PyPI
url: ${{ steps.set_url.outputs.env_url }}
if: "startsWith(github.ref, 'refs/tags/')"
needs: [ build, build-musl, build-no-rustls ]
needs: [ build, build-musl ]
steps:
- uses: actions/download-artifact@v3
with:
Expand Down Expand Up @@ -291,7 +259,7 @@ jobs:
name: Publish to GitHub releases
runs-on: ubuntu-latest
if: "startsWith(github.ref, 'refs/tags/')"
needs: [ build, build-musl, build-no-rustls ]
needs: [ build, build-musl ]
steps:
- uses: actions/download-artifact@v3
with:
Expand Down
132 changes: 25 additions & 107 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ glob = "0.3.0"
cargo-config2 = "0.1.9"
cargo_metadata = "0.18.0"
cargo-options = "0.6.0"
cbindgen = { version = "0.25.0", default-features = false }
cbindgen = { version = "0.26.0", default-features = false }
flate2 = "1.0.18"
goblin = "0.7.1"
platform-info = "2.0.2"
Expand Down Expand Up @@ -88,7 +88,7 @@ tracing = "0.1.36"
tracing-subscriber = { version = "0.3.15", features = ["env-filter"], optional = true }

# project scaffolding, maturin new/init/generate-ci
dialoguer = { version = "0.10.2", default-features = false, optional = true }
dialoguer = { version = "0.11.0", default-features = false, optional = true }
console = { version = "0.15.4", optional = true }
minijinja = { version = "1.0.7", optional = true }

Expand All @@ -99,7 +99,7 @@ dirs = { version = "5.0.0", optional = true }
multipart = { version = "0.18.0", features = ["client"], default-features = false, optional = true }
ureq = { version = "2.7.0", features = ["gzip", "json", "socks-proxy"], default-features = false, optional = true }
native-tls = { version = "0.2.8", optional = true }
rustls = { version = "0.21.2", optional = true }
rustls = { version = "0.21.8", optional = true }
rustls-pemfile = { version = "1.0.1", optional = true }
keyring = { version = "2.0.0", default-features = false, features = ["linux-no-secret-service"], optional = true }
wild = { version = "2.1.0", optional = true }
Expand Down

0 comments on commit c138d63

Please sign in to comment.