From 313b33a2c1f2833629e47a57b0a8ffc174db73e0 Mon Sep 17 00:00:00 2001 From: CocoRoF Date: Tue, 17 Mar 2026 22:39:59 +0900 Subject: [PATCH 1/2] feat: add OpenSSL as a vendored dependency for Linux to prevent version mismatches --- .github/workflows/publish.yml | 8 ++++---- Cargo.lock | 11 +++++++++++ Cargo.toml | 4 ++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c851b7d..6c89db7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -131,13 +131,13 @@ jobs: rust-toolchain: stable sccache: "true" before-script-linux: | - # Install OpenSSL dev headers (for native-tls) and Perl (for openssl-src fallback) + # Install Perl + C toolchain for vendored OpenSSL build if command -v yum &> /dev/null; then - yum install -y openssl-devel perl-IPC-Cmd perl-core + yum install -y perl-IPC-Cmd perl-core elif command -v apk &> /dev/null; then - apk add --no-cache openssl-dev perl make + apk add --no-cache perl make elif command -v apt-get &> /dev/null; then - apt-get update && apt-get install -y libssl-dev pkg-config perl + apt-get update && apt-get install -y perl fi - name: Upload wheels diff --git a/Cargo.lock b/Cargo.lock index 5be8d92..29cf1b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -336,6 +336,7 @@ version = "0.2.7" dependencies = [ "html-escape", "log", + "openssl", "pyo3", "pyo3-log", "rand", @@ -671,6 +672,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-src" +version = "300.5.5+3.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f1787d533e03597a7934fd0a765f0d28e94ecc5fb7789f8053b1e699a56f709" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.112" @@ -679,6 +689,7 @@ checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index 113667b..ea76744 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,3 +23,7 @@ unicode-normalization = "0.1" thiserror = "2" log = "0.4" pyo3-log = "0.12" + +# Vendor OpenSSL on Linux to avoid version mismatches in manylinux containers +[target.'cfg(target_os = "linux")'.dependencies] +openssl = { version = "0.10", features = ["vendored"] } From a104d36f9c7f4a9e19bd939edc76f73c0e9f744e Mon Sep 17 00:00:00 2001 From: CocoRoF Date: Tue, 17 Mar 2026 22:40:15 +0900 Subject: [PATCH 2/2] fix: bump version to 0.2.8 in Cargo.toml and pyproject.toml --- Cargo.toml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ea76744..31ebcf6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "googer" -version = "0.2.7" +version = "0.2.8" edition = "2021" description = "A powerful, type-safe Google Search library for Python — powered by Rust." license = "Apache-2.0" diff --git a/pyproject.toml b/pyproject.toml index 6d68abc..5f721a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "googer" -version = "0.2.7" +version = "0.2.8" description = "A powerful, type-safe Google Search library for Python — powered by Rust." readme = "README.md" requires-python = ">=3.10"