Skip to content

Commit

Permalink
Merge pull request #451 from jongiddy/pin-cloudflare
Browse files Browse the repository at this point in the history
Do not use cloudflare-zlib-sys 0.3.4
  • Loading branch information
joshtriplett authored Feb 10, 2025
2 parents c63acc8 + 7d66bf5 commit 0cb2749
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ jobs:
- run: cargo test --features zlib-rs --no-default-features
if: matrix.build != 'mingw'
- run: cargo test --features cloudflare_zlib --no-default-features
# cloudflare doesn't seem to work on CI anymore for some reason, it's not reproducible locally.
if: matrix.build != 'mingw' && matrix.os != 'ubuntu-latest' && matrix.os != 'windows-2022'
if: matrix.build != 'mingw'
- run: |
if ! cargo check --no-default-features 2>&1 | grep "You need to choose"; then
echo "expected message stating a zlib backend must be chosen"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ libz-sys = { version = "1.1.20", optional = true, default-features = false }
libz-ng-sys = { version = "1.1.16", optional = true }
# this matches the default features, but we don't want to depend on the default features staying the same
libz-rs-sys = { version = "0.4.0", optional = true, default-features = false, features = ["std", "rust-allocator"] }
cloudflare-zlib-sys = { version = "0.3.0", optional = true }
cloudflare-zlib-sys = { version = "0.3.5", optional = true }
miniz_oxide = { version = "0.8.0", optional = true, default-features = false, features = ["with-alloc"] }
crc32fast = "1.2.0"

Expand Down

0 comments on commit 0cb2749

Please sign in to comment.