fix: cargo-generate needs openssl (#1023) (#1024)

shuttle-hq · Jun 20, 2023 · 7cdf5b6 · 7cdf5b6
1 parent 379a57c
commit 7cdf5b6
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -401,7 +401,8 @@ jobs:
           command: |
             # From https://github.com/briansmith/ring/issues/1414#issuecomment-1055177218
             export CC_aarch64_unknown_linux_musl=clang
-            cargo build --release --package cargo-shuttle --target << parameters.target >>
+            # "vendored-openssl" is from https://github.com/cross-rs/cross/issues/229#issuecomment-597898074
+            cargo build --release --package cargo-shuttle --features vendored-openssl --target << parameters.target >>
       - make-artifact:
           target: << parameters.target >>
   build-binaries-windows:
@@ -426,7 +427,8 @@ jobs:
             # From https://github.com/alexcrichton/openssl-src-rs/issues/45
             # Because of https://github.com/openssl/openssl/issues/9048
             $env:OPENSSL_SRC_PERL="C:\Strawberry\perl\bin\perl.exe"
-            ..\.cargo\bin\cargo.exe build --release --package cargo-shuttle --target x86_64-pc-windows-msvc
+            # "vendored-openssl" is from https://github.com/cross-rs/cross/issues/229#issuecomment-597898074
+            ..\.cargo\bin\cargo.exe build --release --package cargo-shuttle --features vendored-openssl --target x86_64-pc-windows-msvc
           shell: powershell.exe
       - make-artifact:
           target: x86_64-pc-windows-msvc
@@ -443,7 +445,8 @@ jobs:
       - run:
           name: Build
           command: |
-            cargo build --release --package cargo-shuttle --target x86_64-apple-darwin
+            # "vendored-openssl" is from https://github.com/cross-rs/cross/issues/229#issuecomment-597898074
+            cargo build --release --package cargo-shuttle --features vendored-openssl --target x86_64-apple-darwin
       - make-artifact:
           target: x86_64-apple-darwin
   publish-github-release:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-shuttle/Cargo.toml b/cargo-shuttle/Cargo.toml
@@ -28,6 +28,7 @@ headers = { workspace = true }
 indicatif = "0.17.3"
 ignore = "0.4.20"
 indoc = "2.0.1"
+openssl = { version = "0.10", optional = true }
 portpicker = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 reqwest-middleware = "0.2.0"
@@ -66,6 +67,9 @@ workspace = true
 workspace = true
 features = ["builder"]
 
+[features]
+vendored-openssl = ["openssl/vendored"]
+
 [dev-dependencies]
 assert_cmd = "2.0.6"
 rexpect = "0.5.0"