From 2d3389dd3235e019fcf7779086eb43f0e0849199 Mon Sep 17 00:00:00 2001 From: Filip Tibell Date: Sat, 6 May 2023 09:53:42 +0200 Subject: [PATCH] Make windows arm-specific dependency more specific --- .github/workflows/release.yaml | 2 +- packages/lib/Cargo.toml | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6cf93b7..16bc1c6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -123,7 +123,7 @@ jobs: targets: ${{ matrix.cargo-target }} - name: Install tooling - if: matrix.runner-os == 'ubuntu-latest' + if: matrix.cargo-target == 'aarch64-unknown-linux-gnu' run: | sudo apt-get update -y sudo apt-get install -y musl-tools clang llvm diff --git a/packages/lib/Cargo.toml b/packages/lib/Cargo.toml index 65e33d8..706a975 100644 --- a/packages/lib/Cargo.toml +++ b/packages/lib/Cargo.toml @@ -45,16 +45,15 @@ hyper = { version = "0.14", features = ["full"] } hyper-tungstenite = { version = "0.9" } tokio-tungstenite = { version = "0.18" } -# Rustls does not yet compile on windows aarch64, so we use default tls there -[target.'cfg(all(target_os = "windows", target_arch = "aarch64"))'.dependencies] -reqwest = { version = "0.11", default-features = false, features = [ - "default-tls", -] } - -[target.'cfg(not(all(target_os = "windows", target_arch = "aarch64")))'.dependencies] +# Using rustls instead of the default OpenSSL allows us to have much more portable binaries reqwest = { version = "0.11", default-features = false, features = [ "rustls-tls", ] } +# Rustls does not yet compile on windows aarch64, so we use default tls there +# https://github.com/briansmith/ring/issues/1167 +[target.aarch64-pc-windows-msvc.dependencies] +reqwest = "0.11" + [dev-dependencies] anyhow = "1.0"