Skip to content

Commit

Permalink
[beta-1.86] depend on openssl-sys to correctly pin its version (#15226)
Browse files Browse the repository at this point in the history
Beta backports

* #15224

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

*
7e0da41
  • Loading branch information
ehuss authored Feb 23, 2025
2 parents ce948f4 + c277a49 commit fcb465c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 18 deletions.
9 changes: 5 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ cargo-credential-macos-keychain.workspace = true

[target.'cfg(not(windows))'.dependencies]
openssl = { workspace = true, optional = true }
openssl-sys = { workspace = true, optional = true } # HACK: for pinning to openssl v1.

[target.'cfg(windows)'.dependencies]
cargo-credential-wincred.workspace = true
Expand Down
16 changes: 2 additions & 14 deletions tests/testsuite/global_cache_tracker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2004,16 +2004,7 @@ fn compatible_with_older_cargo() {
assert_eq!(get_registry_names("src"), ["middle-1.0.0", "new-1.0.0"]);
assert_eq!(
get_registry_names("cache"),
// Duplicate crates from two different cache location
// because we're changing how SourceId is hashed.
// This change should be reverted once rust-lang/cargo#14917 lands.
[
"middle-1.0.0.crate",
"middle-1.0.0.crate",
"new-1.0.0.crate",
"new-1.0.0.crate",
"old-1.0.0.crate"
]
["middle-1.0.0.crate", "new-1.0.0.crate", "old-1.0.0.crate"]
);

// T-0 months: Current version, make sure it can read data from stable,
Expand All @@ -2036,10 +2027,7 @@ fn compatible_with_older_cargo() {
assert_eq!(get_registry_names("src"), ["new-1.0.0"]);
assert_eq!(
get_registry_names("cache"),
// Duplicate crates from two different cache location
// because we're changing how SourceId is hashed.
// This change should be reverted once rust-lang/cargo#14917 lands.
["middle-1.0.0.crate", "new-1.0.0.crate", "new-1.0.0.crate"]
["middle-1.0.0.crate", "new-1.0.0.crate"]
);
}

Expand Down

0 comments on commit fcb465c

Please sign in to comment.