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.

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

fix: cargo-generate needs openssl #1023

Merged
merged 1 commit into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down
52 changes: 52 additions & 0 deletions Cargo.lock

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

4 changes: 4 additions & 0 deletions cargo-shuttle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down