From 87f0ceb2910c418c0101d502b30deb743fd2b5c2 Mon Sep 17 00:00:00 2001 From: aumetra Date: Wed, 25 Oct 2023 20:06:56 +0200 Subject: [PATCH] Fix `cargo-dist` builds (#387) * only enable sha2-asm on non-msvc targets * install libssl-dev * use glibc for now * only plan releases --- Cargo.toml | 5 ++++- crates/kitsune-core/Cargo.toml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 124986dcb..c1b103412 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,12 +64,15 @@ installers = ["shell", "powershell"] targets = [ "aarch64-apple-darwin", "x86_64-apple-darwin", - "x86_64-unknown-linux-musl", + "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc", ] # Publish jobs to run in CI pr-run-mode = "plan" +[workspace.metadata.dist.dependencies.apt] +libssl-dev = "*" + [patch.crates-io] # Patch `isolang` for quicker compiles isolang = { git = "https://github.com/humenda/isolang-rs.git", rev = "f015b8cce82b6168303c84543fdd25f57005141c" } diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index ed208c7e5..8ab05908a 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -61,7 +61,7 @@ rsa = "0.9.2" rusty-s3 = { version = "0.5.0", default-features = false } scoped-futures = "0.1.3" serde = { version = "1.0.189", features = ["derive"] } -sha2 = { version = "0.10.8", features = ["asm"] } +sha2 = "0.10.8" simd-json = "0.12.0" smol_str = "0.2.0" speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } @@ -73,6 +73,9 @@ typed-builder = "0.18.0" url = "2.4.1" zxcvbn = { version = "2.2.2", default-features = false } +[target.'cfg(not(target_env = "msvc"))'.dependencies] +sha2 = { version = "0.10.8", features = ["asm"] } + [features] default = [] mastodon-api = []