Skip to content

Commit

Permalink
Merge pull request #224 from sfackler/no-ossl-3
Browse files Browse the repository at this point in the history
Remove openssl 3 test workarounds
  • Loading branch information
sfackler authored Apr 21, 2022
2 parents f1d2638 + 1db5531 commit 4771748
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 20 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
env:
RUSTFLAGS: -Dwarnings
RUST_BACKTRACE: 1
OPENSSL_CONF: test.conf

jobs:
rustfmt:
Expand Down Expand Up @@ -55,5 +54,5 @@ jobs:
with:
path: target
key: target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
- run: cargo test --features vendored,openssl-src/legacy
- run: cargo test --features vendored,openssl-src/legacy,alpn
- run: cargo test --features vendored
- run: cargo test --features vendored
3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ openssl = "0.10.29"
openssl-sys = "0.9.55"
openssl-probe = "0.1"

[target.'cfg(not(any(target_os = "windows", target_os = "macos", target_os = "ios")))'.build_dependencies]
openssl-src = { version = "300.0.3", optional = true }

[dev-dependencies]
tempfile = "3.0"
test-cert-gen = "0.7"
14 changes: 0 additions & 14 deletions test.conf

This file was deleted.

0 comments on commit 4771748

Please sign in to comment.