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.

Sign up for GitHub

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

Add OpenSSL 3 feature support to CI and configuration #4736

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add OpenSSL 3 feature support to CI and configuration #4736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/cargo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
features: ["", "--features static", "--features schannel", "--features schannel,static"]
features: ["", "--features static", "--features schannel", "--features schannel,static", "--features openssl3", "--features openssl3,static"]
exclude:
- os: ubuntu-latest
features: "--features schannel"
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ include = [
[features]
default = []
schannel = []
openssl3 = []
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since openssl3 is a separate submodule, we need to update include paths above.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes me think we need automation to validate all this stuff. I wonder if we should add a prereq step to our GitHub action that fake publishes the crate locally, then uploads it. Then all other jobs work off the crate, not a git clone.

static = []
preview-api = []

Expand Down
2 changes: 2 additions & 0 deletions scripts/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ fn main() {
.define("QUIC_OUTPUT_DIR", quic_output_dir.to_str().unwrap());
if cfg!(feature = "schannel") {
config.define("QUIC_TLS", "schannel");
} else if cfg!(feature = "openssl3") {
config.define("QUIC_TLS", "openssl3");
} else {
config.define("QUIC_TLS", "openssl");
}
Expand Down
Loading