From 0664b4fbdfe979ff14369ebb83b278c7524ed638 Mon Sep 17 00:00:00 2001 From: Therapon Skoteiniotis Date: Mon, 24 Jul 2023 13:13:41 -0700 Subject: [PATCH] build: use statically linked libssl --- .github/workflows/release_engine.yml | 1 + Cargo.lock | 10 ++++++++++ Cargo.toml | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release_engine.yml b/.github/workflows/release_engine.yml index 7a0c7f0bf..c7a8099f1 100644 --- a/.github/workflows/release_engine.yml +++ b/.github/workflows/release_engine.yml @@ -374,6 +374,7 @@ jobs: - name: Build and push Docker images for Jupyter Beta uses: docker/build-push-action@v4 + if: startsWith(github.ref, 'refs/tags/engine@v') && contains(github.ref, 'beta') with: context: . platforms: linux/amd64, linux/arm64 diff --git a/Cargo.lock b/Cargo.lock index 3bc824fe1..2da928ad7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2885,6 +2885,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "openssl-src" +version = "111.26.0+1.1.1u" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efc62c9f12b22b8f5208c23a7200a442b2e5999f8bdf80233852122b5a4f6f37" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.90" @@ -2893,6 +2902,7 @@ checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml index 92c6bc003..79916575f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ prost-wkt-build = "0.4.1" prost-wkt-types = "0.4.1" pulsar = { version = "5.1.0", default-features = false, features = ["async-std-runtime", "tokio-runtime", "lz4"] } rand = "0.8.5" -reqwest = "0.11.14" +reqwest = { version = "0.11.14", features = ["native-tls-vendored"] } serde = { version = "1.0.159", features = ["derive", "rc"] } serde_json = "1.0.95" serde_yaml = "0.9.19"