Skip to content

Commit

Permalink
make native-tls optional (for those that are not statically linking) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
demoray authored Aug 16, 2023
1 parent 68d5654 commit 2f61331
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

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

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "avml"
version = "0.11.4"
version = "0.12.0"
license = "MIT"
description = "A portable volatile memory acquisition tool"
authors = ["[email protected]"]
Expand All @@ -13,10 +13,11 @@ edition = "2021"
rust-version = "1.64.0"

[features]
default = ["put", "blobstore"]
put = ["dep:reqwest", "reqwest?/stream", "dep:url", "dep:tokio", "dep:tokio-util", "dep:native-tls"]
blobstore = ["dep:url", "dep:azure_core", "dep:azure_storage_blobs", "dep:tokio", "dep:tokio-util", "dep:async-channel", "dep:native-tls"]
default = ["put", "blobstore", "native-tls"]
put = ["dep:reqwest", "reqwest?/stream", "dep:url", "dep:tokio", "dep:tokio-util"]
blobstore = ["dep:url", "dep:azure_core", "dep:azure_storage_blobs", "dep:tokio", "dep:tokio-util", "dep:async-channel"]
status = ["dep:atty", "dep:indicatif"]
native-tls = ["dep:native-tls"]

[dependencies]
byteorder = "1.4"
Expand Down
2 changes: 1 addition & 1 deletion eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cargo semver-checks check-release
cargo clippy --locked --all-targets --all-features -- -D warnings -D clippy::pedantic -A clippy::missing_errors_doc
cargo test --release --target x86_64-unknown-linux-musl --locked --all-targets --all-features
for FEATURE in $(cargo metadata --locked --format-version 1 | jq '.packages | [.[] | select(.name=="avml")][0].features | keys | @tsv' -r); do
cargo check --release --target x86_64-unknown-linux-musl --locked --no-default-features --features ${FEATURE}
cargo check --release --target x86_64-unknown-linux-musl --locked --no-default-features --features ${FEATURE} --features native-tls
done
cargo build --release --no-default-features --target x86_64-unknown-linux-musl --locked
cp target/x86_64-unknown-linux-musl/release/avml target/x86_64-unknown-linux-musl/release/avml-minimal
Expand Down

0 comments on commit 2f61331

Please sign in to comment.