Make bundling of ssl conditionned by target environment instead of feature flag.

This commit is contained in:
KtorZ 2024-10-02 10:50:54 +02:00
parent b0cad2bf1d
commit 19fe1d37e7
No known key found for this signature in database
GPG Key ID: 33173CB6F77F4277
4 changed files with 3 additions and 9 deletions

View File

@ -22,7 +22,7 @@ jobs:
run: | run: |
sudo apt-get install -y pkg-config libssl-dev musl musl-dev musl-tools sudo apt-get install -y pkg-config libssl-dev musl musl-dev musl-tools
rustup target add x86_64-unknown-linux-musl rustup target add x86_64-unknown-linux-musl
cargo install --path=crates/aiken -F bundle_openssl --target=x86_64-unknown-linux-musl cargo install --path=crates/aiken --target=x86_64-unknown-linux-musl
mv $(which aiken) aiken mv $(which aiken) aiken
ldd aiken ldd aiken
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4

View File

@ -43,10 +43,6 @@ publish-prereleases = true
# as one would normally write them in a workflow. # as one would normally write them in a workflow.
github-build-setup = "../musl-build-setup.yml" github-build-setup = "../musl-build-setup.yml"
[[workspace.metadata.dist.artifact]]
target = "x86_64-unknown-linux-musl"
features = ["bundle_openssl"]
# Cargo-dist uses ubuntu-20.04 by default, causing issues in various cases # Cargo-dist uses ubuntu-20.04 by default, causing issues in various cases
# because it links with openssl-1.1 whereas recent distro ships with 3.x # because it links with openssl-1.1 whereas recent distro ships with 3.x
[workspace.metadata.dist.github-custom-runners] [workspace.metadata.dist.github-custom-runners]

View File

@ -47,11 +47,9 @@ serde_json = "1.0.94"
thiserror = "1.0.39" thiserror = "1.0.39"
uplc = { path = '../uplc', version = "1.1.4" } uplc = { path = '../uplc', version = "1.1.4" }
[target.'cfg(target_env = "musl")'.dependencies]
openssl = { version = "0.10.66", features = ["vendored"], optional = true } openssl = { version = "0.10.66", features = ["vendored"], optional = true }
openssl-probe = { version = "0.1.5", optional = true } openssl-probe = { version = "0.1.5", optional = true }
[features]
bundle_openssl = ["dep:openssl", "dep:openssl-probe"]
[target.'cfg(not(windows))'.dependencies] [target.'cfg(not(windows))'.dependencies]
xdg = "2.5.2" xdg = "2.5.2"

View File

@ -14,7 +14,7 @@ mod cmd;
fn main() -> miette::Result<()> { fn main() -> miette::Result<()> {
panic_handler(); panic_handler();
#[cfg(feature = "bundle_openssl")] #[cfg(target_env = "musl")]
openssl_probe::init_ssl_cert_env_vars(); openssl_probe::init_ssl_cert_env_vars();
match Cmd::default() { match Cmd::default() {