From ead0470c3e801de1debc8a8d65a5599864d9265f Mon Sep 17 00:00:00 2001 From: Scott Lyons Date: Thu, 15 Aug 2024 08:48:38 -0700 Subject: [PATCH] fix(cargo): adding vendored openssl to help with build --- .github/workflows/CI.yaml | 2 +- Cargo.lock | 11 +++++++++++ szurubooru-client/Cargo.toml | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 4f8eca1..3a1c58a 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -161,7 +161,7 @@ jobs: uses: PyO3/maturin-action@v1 with: command: sdist - args: -F python --out dist -m szurubooru-client/Cargo.toml + args: --out dist -m szurubooru-client/Cargo.toml - name: Upload sdist uses: actions/upload-artifact@v4 with: diff --git a/Cargo.lock b/Cargo.lock index 4af98b4..98904d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -883,6 +883,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" @@ -891,6 +900,7 @@ checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -1576,6 +1586,7 @@ dependencies = [ "futures-util", "hex", "mockito", + "openssl", "pyo3", "reqwest", "serde", diff --git a/szurubooru-client/Cargo.toml b/szurubooru-client/Cargo.toml index 585066f..8a4565b 100644 --- a/szurubooru-client/Cargo.toml +++ b/szurubooru-client/Cargo.toml @@ -16,6 +16,7 @@ chrono = { version = "0.4.38", features = ["serde"] } derive_builder = "0.20.0" futures-util = "0.3.30" hex = "0.4.3" +openssl = { version = "0.10.66", features = ["vendored"] } pyo3 = { version="0.22.0", optional=true, features=["chrono-tz", "chrono", "extension-module", "serde", "experimental-async"] } reqwest = { version = "0.12.5", features = ["json", "multipart", "stream"] } serde = { version = "1.0.204", features = ["derive"] }