Skip to content

chore: depend on openssl-sys to correctly pin its version#15224

Merged
ehuss merged 1 commit intorust-lang:masterfrom
weihanglo:openssl
Feb 23, 2025
Merged

chore: depend on openssl-sys to correctly pin its version#15224
ehuss merged 1 commit intorust-lang:masterfrom
weihanglo:openssl

Conversation

@weihanglo
Copy link
Member

@weihanglo weihanglo commented Feb 23, 2025 •
edited
Loading

What does this PR try to resolve?

From #13546 (comment)

This was an overlook in #15166 and apparently we forgot to actually add openssl-sys to cargo package. The pinned version is under workspace.dependencies so it never really affect the dependency resolution.

The bad news is that #15166 is now in beta toolchain already. If we're going to fix this again we might need to revert it in beta as well.

This PR fixes it. However, I think we should find a way to unpin the version.

How should we test and review this PR?

If we're going to merge this, we might want to backport to beta

@rustbot
Copy link
Collaborator

rustbot commented Feb 23, 2025

r? @epage

rustbot has assigned @epage.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 23, 2025
ehuss
ehuss approved these changes Feb 23, 2025
View reviewed changes
Copy link
Contributor

@ehuss ehuss left a comment

Choose a reason for hiding this comment

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

Thanks!

Approved for beta, too. Can you send a PR for that?

@ehuss ehuss added this pull request to the merge queue Feb 23, 2025
@weihanglo weihanglo mentioned this pull request Feb 23, 2025
Merged
@weihanglo
Copy link
Member Author

weihanglo commented Feb 23, 2025

Thanks for the review!

Beta backport PR is here: #15226.

Merged via the queue into rust-lang:master with commit 81955eb Feb 23, 2025
22 of 23 checks passed
ehuss added a commit that referenced this pull request Feb 23, 2025
@ehuss
[beta-1.86] depend on openssl-sys to correctly pin its version (#15226)
fcb465c 
Beta backports

* #15224

In order to make CI pass, the following PRs are also cherry-picked:

*
7e0da41
@weihanglo weihanglo mentioned this pull request Feb 28, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 28, 2025
@bors
Auto merge of rust-lang#137791 - weihanglo:update-cargo, r=weihanglo
2874876 
Update cargo

11 commits in 1d1d646c06a84c1aa53967b394b7f1218f85db82..2622e844bc1e2e6123e54e94e4706f7b6195ce3d
2025-02-21 21:38:53 +0000 to 2025-02-28 12:33:57 +0000
- Bump `cc` to 1.2.16 to fix `x86` windows jobs in rust-lang/rust CI (rust-lang/cargo#15245)
- refactor(tree): Abstract the concept of a NodeId (rust-lang/cargo#15237)
- feat: implement RFC 3553 to add SBOM support (rust-lang/cargo#13709)
- refactor(tree): Abstract the concept of an edge (rust-lang/cargo#15233)
- chore: bump openssl to v3 (rust-lang/cargo#15232)
- fix(package): Register workspace member renames in overlay  (rust-lang/cargo#15228)
- Implemented `build.build-dir` config option (rust-lang/cargo#15104)
- feat: add completions for `--manifest-path` (rust-lang/cargo#15225)
- chore: semver-check build-rs against beta channel (rust-lang/cargo#15223)
- chore: depend on openssl-sys to correctly pin its version (rust-lang/cargo#15224)
- chore: dont check cargo-util semver until 1.86 is released (rust-lang/cargo#15222)
@rustbot rustbot added this to the 1.87.0 milestone Feb 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ehuss ehuss ehuss approved these changes

Assignees

@epage epage

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

Projects

None yet

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

4 participants

@weihanglo @rustbot @ehuss @epage