Skip to content

Commit

Permalink
Add 'openssl' as explicit dep, update test workflow for win
Browse files Browse the repository at this point in the history
  • Loading branch information
rustworthy committed Dec 11, 2023
1 parent 721405f commit b9d8dd5
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 40 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ jobs:
matrix:
os: [macos-latest, windows-latest]
steps:
# https://github.com/sfackler/rust-openssl/issues/1542#issuecomment-1399358351
- name: Procure openssl on windows
if: runner.os == 'Windows'
run: |
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
vcpkg install openssl:x64-windows-static-md
- uses: actions/checkout@v3
with:
submodules: true
Expand Down
80 changes: 41 additions & 39 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ categories = ["api-bindings", "asynchronous", "network-programming"]

[features]
default = []
tls = ["native-tls"]
tls = ["native-tls", "openssl", "openssl-sys"]
binaries = ["clap"]

[dependencies]
Expand All @@ -31,6 +31,8 @@ url = "2"
atomic-option = "0.1"
fnv = "1.0.5"
native-tls = { version = "0.2", optional = true }
openssl = { version = "0.10.61", optional = true }
openssl-sys = { version = "0.9.97", optional = true }
clap = { version = "4.4.10", optional = true }
thiserror = "1.0.30"

Expand Down

0 comments on commit b9d8dd5

Please sign in to comment.