Skip to content

Commit

Permalink
Add schannel feature support and update CI configuration (#4735)
Browse files Browse the repository at this point in the history
  • Loading branch information
masa-koz authored Jan 3, 2025
1 parent 5eb2b6a commit 9610803
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/cargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,20 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
features: ["", "--features static"]
features: ["", "--features static", "--features schannel", "--features schannel,static"]
exclude:
- os: ubuntu-latest
features: "--features schannel"
- os: ubuntu-latest
features: "--features schannel,static"
- os: macos-latest
features: "--features schannel"
- os: macos-latest
features: "--features schannel,static"
- os: macos-latest-xlarge
features: "--features schannel"
- os: macos-latest-xlarge
features: "--features schannel,static"
runs-on: ${{ matrix.os }}
name: Cargo
steps:
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ include = [

[features]
default = []
schannel = []
static = []
preview-api = []

Expand Down
6 changes: 5 additions & 1 deletion scripts/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ fn main() {
let mut config = Config::new(".");
config
.define("QUIC_ENABLE_LOGGING", logging_enabled)
.define("QUIC_TLS", "openssl")
.define("QUIC_OUTPUT_DIR", quic_output_dir.to_str().unwrap());
if cfg!(feature = "schannel") {
config.define("QUIC_TLS", "schannel");
} else {
config.define("QUIC_TLS", "openssl");
}
if cfg!(feature = "static") {
config.define("QUIC_BUILD_SHARED", "off");
}
Expand Down

0 comments on commit 9610803

Please sign in to comment.