Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): build openssl statically in manylinux2014 build #1115

Merged
merged 2 commits into from
Dec 26, 2023
Merged

chore(release): build openssl statically in manylinux2014 build #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de379f6
chore(release): build libssl statically in manylinux2014 build
wsxiaoys Dec 26, 2023
df286ff
fix: add openssl to cargo-machete ignore
wsxiaoys Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,17 @@ jobs:
target: x86_64-unknown-linux-gnu
binary: x86_64-manylinux2014
container: quay.io/pypa/manylinux2014_x86_64
build_args: --features static-ssl
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
binary: x86_64-manylinux2014-cuda117
container: sameli/manylinux2014_x86_64_cuda_11.7
build_args: --features cuda
build_args: --features static-ssl --features cuda
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
binary: x86_64-manylinux2014-cuda122
container: sameli/manylinux2014_x86_64_cuda_12.2
build_args: --features cuda
build_args: --features static-ssl --features cuda
- os: windows-latest
target: x86_64-pc-windows-msvc
binary: x86_64-windows-msvc
Expand All @@ -65,7 +66,7 @@ jobs:
target: x86_64-unknown-linux-gnu
binary: x86_64-manylinux2014-rocm57
container: ghcr.io/cromefire/hipblas-manylinux/2014/5.7:latest
build_args: --features rocm
build_args: --features static-ssl --features rocm

env:
SCCACHE_GHA_ENABLED: true
Expand Down
11 changes: 11 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions crates/tabby/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ ee = ["dep:tabby-webserver"]
cuda = ["llama-cpp-bindings/cuda"]
rocm = ["llama-cpp-bindings/rocm"]
experimental-http = ["dep:http-api-bindings"]
# If compiling on a system without OpenSSL installed, or cross-compiling for a different
# architecture, enable this feature to compile OpenSSL as part of the build.
# See https://docs.rs/openssl/#vendored for more.
static-ssl = ['openssl/vendored']

[dependencies]
tabby-common = { path = "../tabby-common" }
Expand Down Expand Up @@ -52,6 +56,10 @@ thiserror.workspace = true
chrono = "0.4.31"
axum-prometheus = "0.4.0"

[dependencies.openssl]
optional = true
version = "*"

[dependencies.uuid]
version = "1.3.3"
features = [
Expand All @@ -68,3 +76,6 @@ assert-json-diff = "2.0.2"
insta = { version = "1.34.0", features = ["yaml", "redactions"] }
reqwest.workspace = true
serde-jsonlines = "0.5.0"

[package.metadata.cargo-machete]
ignored = ["openssl"]
Loading