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.

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 new feature vendored-openssl #1648

Merged
merged 4 commits into from Mar 11, 2023
Merged

Add new feature vendored-openssl #1648

merged 4 commits into from Mar 11, 2023

Conversation

NobodyXu
Copy link
Contributor

@NobodyXu NobodyXu commented Mar 9, 2023

To build and use a vendored version of openssl for cases where the environment does not have openssl installed, e.g. in cross compilation.

Copy link
Collaborator

@Xuanwo Xuanwo left a comment

Choose a reason for hiding this comment

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

LGTM

@sylvestre
Copy link
Collaborator

it is very red in the CI :)

@NobodyXu
Copy link
Contributor Author

NobodyXu commented Mar 9, 2023

it is very red in the CI :)

Seems to be caused by the --locked and a not up-to-date Cargo.lock.

@NobodyXu
Copy link
Contributor Author

NobodyXu commented Mar 9, 2023

The integration tests mostly passed and one is still running, so I don't think the CI failure is caused by this PR.

@Xuanwo
Copy link
Collaborator

Xuanwo commented Mar 9, 2023

The integration tests mostly passed and one is still running, so I don't think the CI failure is caused by this PR.

I'm guessing you need to update the Cargo.lock? vendor openssl will add new deps.

@NobodyXu
Copy link
Contributor Author

The integration tests mostly passed and one is still running, so I don't think the CI failure is caused by this PR.

I'm guessing you need to update the Cargo.lock? vendor openssl will add new deps.

Aha you are right!
I forgot that openssl-sys pulls in openssl-src if vendored is enabled.

@NobodyXu
Copy link
Contributor Author

@Xuanwo I've updated the Cargo.lock and running cargo t --locked locally succeeded.

@sylvestre
Copy link
Collaborator

Could you please add some docs about this?
thanks

To build and use a vendored version of `openssl` for cases where the environment does not have openssl installed, e.g. in cross compilation.
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@codecov-commenter
Copy link

codecov-commenter commented Mar 11, 2023

Codecov Report

Patch coverage has no change and project coverage change: -0.02 ⚠️

Comparison is base (9a4149c) 29.56% compared to head (b1843e4) 29.54%.

❗ Current head b1843e4 differs from pull request most recent head 78023f0. Consider uploading reports for the commit 78023f0 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1648      +/-   ##
==========================================
- Coverage   29.56%   29.54%   -0.02%     
==========================================
  Files          49       49              
  Lines       17012    17012              
  Branches     8188     8200      +12     
==========================================
- Hits         5029     5027       -2     
+ Misses       6995     6993       -2     
- Partials     4988     4992       +4     

see 14 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Copy link
Contributor Author

Could you please add some docs about this? thanks

@sylvestre I've added comment explaining what vendored-openssl does to Cargo.toml.
Do you want me to also add some doc for it in README.md?

@NobodyXu
Copy link
Contributor Author

The FreeBSD failure seems to be caused by pizzamig failed to umount/cleanup.

@sylvestre
Copy link
Collaborator

yeah, i was hoping for the README.md (mostly) ;)
sorry for the lack of precision

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Copy link
Contributor Author

@sylvestre Thanks, I've updated README.md

@sylvestre sylvestre merged commit 446d9c7 into mozilla:main Mar 11, 2023
@NobodyXu NobodyXu deleted the patch-1 branch March 11, 2023 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants