Skip to content

Commit

Permalink
Auto merge of #12381 - epage:msrv, r=weihanglo
Browse files Browse the repository at this point in the history
fix: Set MSRV for internal packages

### What does this PR try to resolve?

Correctly communicates the MSRV we support to our users.

For packages that are more generally mean to be used by other people, I've punted on for now (see ehuss' comment on this PR).  We'll likely need to figure this out for #12432 though

### Additional information

This is prep for a future change which will have us use a fixed rust version for the semver tests with a PR updating them.
  • Loading branch information
bors committed Aug 24, 2023
2 parents 82818ab + 87b6e0e commit 2a159aa
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 4 deletions.
26 changes: 26 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,33 @@
ignorePaths: [
"**/tests/**",
],
regexManagers: [
{
customType: 'regex',
fileMatch: [
'^Cargo.toml$',
],
matchStrings: [
'rust-version.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
],
depNameTemplate: 'latest-msrv',
packageNameTemplate: 'rust-lang/rust',
datasourceTemplate: 'github-releases',
},
],
packageRules: [
{
commitMessageTopic: 'Latest MSRV',
matchManagers: [
'regex',
],
matchPackageNames: [
'latest-msrv',
],
schedule: [
'* * * * *',
],
},
// Goals:
// - Rollup safe upgrades to reduce CI runner load
// - Have lockfile and manifest in-sync (implicit rules)
Expand Down
4 changes: 2 additions & 2 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 @@ -11,6 +11,7 @@ exclude = [
]

[workspace.package]
rust-version = "1.71.0"
edition = "2021"
license = "MIT OR Apache-2.0"

Expand Down
1 change: 1 addition & 0 deletions benches/benchsuite/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "benchsuite"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
license.workspace = true
homepage = "https://github.com/rust-lang/cargo"
Expand Down
1 change: 1 addition & 0 deletions benches/capture/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "capture"
version = "0.1.0"
rust-version.workspace = true
edition.workspace = true
license.workspace = true
description = "Tool for capturing a real-world workspace for benchmarking."
Expand Down
1 change: 1 addition & 0 deletions crates/cargo-test-macro/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "cargo-test-macro"
version = "0.1.0"
rust-version.workspace = true
edition.workspace = true
license.workspace = true
homepage = "https://github.com/rust-lang/cargo"
Expand Down
1 change: 1 addition & 0 deletions crates/cargo-test-support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "cargo-test-support"
version = "0.1.0"
rust-version.workspace = true
license.workspace = true
edition.workspace = true
publish = false
Expand Down
3 changes: 2 additions & 1 deletion crates/cargo-util/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "cargo-util"
version = "0.2.6"
version = "0.2.7"
rust-version.workspace = true
edition.workspace = true
license.workspace = true
homepage = "https://github.com/rust-lang/cargo"
Expand Down
3 changes: 2 additions & 1 deletion crates/crates-io/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "crates-io"
version = "0.38.0"
version = "0.38.1"
rust-version.workspace = true
edition.workspace = true
license.workspace = true
repository = "https://github.com/rust-lang/cargo"
Expand Down
1 change: 1 addition & 0 deletions crates/mdman/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "mdman"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
license.workspace = true
description = "Creates a man page page from markdown."
Expand Down
1 change: 1 addition & 0 deletions crates/resolver-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "resolver-tests"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 1 addition & 0 deletions crates/semver-check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "semver-check"
version = "0.0.0"
authors = ["Eric Huss"]
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 1 addition & 0 deletions crates/xtask-build-man/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "xtask-build-man"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 1 addition & 0 deletions crates/xtask-bump-check/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "xtask-bump-check"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down
1 change: 1 addition & 0 deletions crates/xtask-stale-label/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[package]
name = "xtask-stale-label"
version = "0.0.0"
rust-version.workspace = true
edition.workspace = true
publish = false

Expand Down

0 comments on commit 2a159aa

Please sign in to comment.