-
Notifications
You must be signed in to change notification settings - Fork 124
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(s2n-quic-rustls, s2n-quic-tls): enable building with default features #1673
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,7 @@ env: | |
| # Pin the nightly toolchain to prevent breakage. | ||
| # This should be occasionally updated. | ||
| RUST_NIGHTLY_TOOLCHAIN: nightly-2023-02-20 | ||
| MSRV: 1.63 | ||
| CDN: https://dnglbrstg7yg.cloudfront.net | ||
| # enable unstable features for testing | ||
| S2N_UNSTABLE_CRYPTO_OPT_TX: 100 | ||
|
|
@@ -28,6 +29,7 @@ jobs: | |
| rust-versions: ${{ steps.definitions.outputs.versions }} | ||
| msrv: ${{ steps.definitions.outputs.msrv }} | ||
| examples: ${{ steps.definitions.outputs.examples }} | ||
| crates: ${{ steps.definitions.outputs.crates }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| # examples is populated by | ||
|
|
@@ -50,6 +52,9 @@ jobs: | |
| export EXAMPLES=$(find examples/ -maxdepth 1 -mindepth 1 -type d | jq -R | jq -sc) | ||
| echo "examples=$EXAMPLES" | ||
| echo "examples=$EXAMPLES" >> $GITHUB_OUTPUT | ||
| export CRATES=$(find find quic common -name *Cargo.toml | jq -R | jq -sc) | ||
| echo "crates=$CRATES" | ||
| echo "crates=$CRATES" >> $GITHUB_OUTPUT | ||
|
|
||
| rustfmt: | ||
| runs-on: ubuntu-latest | ||
|
|
@@ -357,6 +362,35 @@ jobs: | |
| status: "success" | ||
| url: "${{ steps.s3.outputs.URL }}" | ||
|
|
||
| # This CI step will directly build each crate in common/ and quic/ which is | ||
| # useful because it sidesteps the feature resolution that normally occurs in a | ||
| # workspace build. We make sure that the crates build with default features, | ||
| # otherwise release to crates.io will be blocked | ||
| crates: | ||
| needs: env | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| crate: ${{ fromJson(needs.env.outputs.crates) }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - uses: actions-rs/[email protected] | ||
| id: toolchain | ||
| with: | ||
| toolchain: ${{ env.MSRV }} | ||
| profile: minimal | ||
| override: true | ||
|
|
||
| - name: build | ||
| uses: actions-rs/[email protected] | ||
| with: | ||
| command: build | ||
| args: --manifest-path ${{ matrix.crate }} | ||
|
|
||
| examples: | ||
| needs: env | ||
| runs-on: ubuntu-latest | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We seem to already have a msrv that we parse from the rust-toolchain below in
env. Do we also need this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good call out, will update.