From f76d22de1079708a30a55d4db39c5efc11d3c51a Mon Sep 17 00:00:00 2001 From: Nick Gregory Date: Fri, 25 Oct 2024 15:17:51 -0400 Subject: [PATCH] build fixes --- .github/workflows/cli-release.yaml | 2 +- Cargo.lock | 25 ++++++++++--------------- Cargo.toml | 2 +- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cli-release.yaml b/.github/workflows/cli-release.yaml index 8fb7f1b..d6054fc 100644 --- a/.github/workflows/cli-release.yaml +++ b/.github/workflows/cli-release.yaml @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - target: [x86_64-pc-windows-gnu, aarch64-pc-windows-gnu] + target: [x86_64-pc-windows-gnu] steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index f893dc8..da4d9bc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1106,7 +1106,6 @@ checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", - "libssh2-sys", "libz-sys", "openssl-sys", "pkg-config", @@ -1132,20 +1131,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - [[package]] name = "libz-sys" version = "1.1.19" @@ -1425,6 +1410,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "300.3.1+3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.103" @@ -1433,6 +1427,7 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index 0760195..82ed6cf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ futures-channel = "0.3.30" regex = "1.10.6" markdown = "1.0.0-alpha.19" lazy-regex = "3.2.0" -git2 = "0.19.0" +git2 = { version = "0.19.0", default-features = false, features = ["https", "vendored-openssl"]} ratatui = { version = "0.28.0", features = ["unstable-rendered-line-info"]} open = "5.3.0" syntect = "5.2.0"