Skip to content

[beta-1.86] depend on openssl-sys to correctly pin its version #15226

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

Merged
merged 2 commits into from
Feb 23, 2025
Merged

[beta-1.86] depend on openssl-sys to correctly pin its version #15226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76fa5b4
chore: depend on openssl-sys to correctly pin its version
weihanglo Feb 23, 2025
c277a49
test(gc): Update tests for latest stable
epage Feb 20, 2025
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
9 changes: 5 additions & 4 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
Loading