From 7a65c826a0ba91e48d275ca016e6fdf1c03f31bf Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 19 Jul 2023 09:21:25 -0500 Subject: [PATCH 1/2] fix: Set MSRV for internal packages For now, I'm punting on packages we generally expect others to use --- Cargo.lock | 4 ++-- Cargo.toml | 1 + benches/benchsuite/Cargo.toml | 1 + benches/capture/Cargo.toml | 1 + crates/cargo-test-macro/Cargo.toml | 1 + crates/cargo-test-support/Cargo.toml | 1 + crates/cargo-util/Cargo.toml | 3 ++- crates/crates-io/Cargo.toml | 3 ++- crates/mdman/Cargo.toml | 1 + crates/resolver-tests/Cargo.toml | 1 + crates/semver-check/Cargo.toml | 1 + crates/xtask-build-man/Cargo.toml | 1 + crates/xtask-bump-check/Cargo.toml | 1 + crates/xtask-stale-label/Cargo.toml | 1 + 14 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78afddfbaac..4a39ee141e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -427,7 +427,7 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.6" +version = "0.2.7" dependencies = [ "anyhow", "core-foundation", @@ -588,7 +588,7 @@ dependencies = [ [[package]] name = "crates-io" -version = "0.38.0" +version = "0.38.1" dependencies = [ "curl", "percent-encoding", diff --git a/Cargo.toml b/Cargo.toml index 2659e496161..fbcab0fa29c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ exclude = [ ] [workspace.package] +rust-version = "1.71.0" edition = "2021" license = "MIT OR Apache-2.0" diff --git a/benches/benchsuite/Cargo.toml b/benches/benchsuite/Cargo.toml index c15798787cc..81413e761d8 100644 --- a/benches/benchsuite/Cargo.toml +++ b/benches/benchsuite/Cargo.toml @@ -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" diff --git a/benches/capture/Cargo.toml b/benches/capture/Cargo.toml index e42fe70e282..e300815d5a2 100644 --- a/benches/capture/Cargo.toml +++ b/benches/capture/Cargo.toml @@ -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." diff --git a/crates/cargo-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml index b5da0522f18..1e81ab314a2 100644 --- a/crates/cargo-test-macro/Cargo.toml +++ b/crates/cargo-test-macro/Cargo.toml @@ -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" diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index 085041affd1..31cf2725de5 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -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 diff --git a/crates/cargo-util/Cargo.toml b/crates/cargo-util/Cargo.toml index 99a59422de0..cba00f91701 100644 --- a/crates/cargo-util/Cargo.toml +++ b/crates/cargo-util/Cargo.toml @@ -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" diff --git a/crates/crates-io/Cargo.toml b/crates/crates-io/Cargo.toml index 139b8aa9740..c9ed50a1ab2 100644 --- a/crates/crates-io/Cargo.toml +++ b/crates/crates-io/Cargo.toml @@ -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" diff --git a/crates/mdman/Cargo.toml b/crates/mdman/Cargo.toml index ba1d4b462bc..fd33da3c201 100644 --- a/crates/mdman/Cargo.toml +++ b/crates/mdman/Cargo.toml @@ -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." diff --git a/crates/resolver-tests/Cargo.toml b/crates/resolver-tests/Cargo.toml index 5e69d736799..033da4195ed 100644 --- a/crates/resolver-tests/Cargo.toml +++ b/crates/resolver-tests/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "resolver-tests" version = "0.0.0" +rust-version.workspace = true edition.workspace = true publish = false diff --git a/crates/semver-check/Cargo.toml b/crates/semver-check/Cargo.toml index 17e69656609..7387c3091ce 100644 --- a/crates/semver-check/Cargo.toml +++ b/crates/semver-check/Cargo.toml @@ -2,6 +2,7 @@ name = "semver-check" version = "0.0.0" authors = ["Eric Huss"] +rust-version.workspace = true edition.workspace = true publish = false diff --git a/crates/xtask-build-man/Cargo.toml b/crates/xtask-build-man/Cargo.toml index bec10c48ce9..9e92125a147 100644 --- a/crates/xtask-build-man/Cargo.toml +++ b/crates/xtask-build-man/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "xtask-build-man" version = "0.0.0" +rust-version.workspace = true edition.workspace = true publish = false diff --git a/crates/xtask-bump-check/Cargo.toml b/crates/xtask-bump-check/Cargo.toml index e965ad09e65..e878f7dda66 100644 --- a/crates/xtask-bump-check/Cargo.toml +++ b/crates/xtask-bump-check/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "xtask-bump-check" version = "0.0.0" +rust-version.workspace = true edition.workspace = true publish = false diff --git a/crates/xtask-stale-label/Cargo.toml b/crates/xtask-stale-label/Cargo.toml index b1f54a2f13d..8d68536d25b 100644 --- a/crates/xtask-stale-label/Cargo.toml +++ b/crates/xtask-stale-label/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "xtask-stale-label" version = "0.0.0" +rust-version.workspace = true edition.workspace = true publish = false From 87b6e0e684729bd77c07a45befbf759cbb0fc490 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 19 Jul 2023 09:21:37 -0500 Subject: [PATCH 2/2] chore: Automate updating of MSRV --- .github/renovate.json5 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 8ad9952d282..c21d7cfc7ca 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -8,7 +8,33 @@ ignorePaths: [ "**/tests/**", ], + regexManagers: [ + { + customType: 'regex', + fileMatch: [ + '^Cargo.toml$', + ], + matchStrings: [ + 'rust-version.*?(?\\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)