make vendored openssl build optional via a feature flag

Lodestone-Team · Mar 14, 2023 · 7c1315b · 7c1315b
1 parent f50d2ce
commit 7c1315b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
@@ -97,7 +97,7 @@ jobs:
  with:
  use-cross: true
  command: build
- args: --release --target ${{ matrix.platform }}
+ args: --release --features "vendored-openssl" --target ${{ matrix.platform }}
 
  # on windows it's ./target/release/main.exe
  # on linux it's ./target/release/main

diff --git a/Cargo.toml b/Cargo.toml
@@ -83,7 +83,7 @@ ts-rs = "6.2.1"
 walkdir = "2.3.2"
 whoami = "1.2.3"
 zip = "0.6.2"
-openssl = { version = "0.10.45", features = ["vendored"] }
+openssl = { version = "0.10.45", features = ["vendored"], optional = true }
 flate2 = "1.0.24"
 tar = "0.4.38"
 unrar = "0.4.4"
@@ -95,3 +95,6 @@ features = [
  "fast-rng", # Use a faster (but still sufficiently random) RNG
  "macro-diagnostics", # Enable better diagnostics for compile-time UUIDs
 ]
+
+[features]
+vendored-openssl = ["dep:openssl"]
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /app
 COPY . ./
 
 # build app using 'release' profile
-RUN cargo build --release
+RUN cargo build --release --features "vendored-openssl"
 
 FROM debian:bullseye-slim as production