Auto merge of #12654 - epage:msrv, r=weihanglo

bors · bors · commit 336815a66158 · 2023-10-08T15:02:21.000Z
Set and verify all MSRVs in CI ### What does this PR try to resolve? Allow us to advertise an MSRV for all public packages, unblocking #12432. Packages are broken down into two MSRV policies - Internal packages: `rust-version=stable` - Public packages: `rust-version=stable-2` To support this - RenovateBot will automatically update all MSRVs - CI will verify all packages build according to their MSRV Since this takes the "single workspace" approach, the downside is that common dependencies are subject to each package's MSRV. We also can't rely on `-Zmsrv-policy` to help us generate a lockfile because it breaks down when trying to support multiple MSRVs in a workspace ### How should we test and review this PR? Per commit ### Additional information #12381 skipped setting some MSRVs because we weren't sure how to handle it. For `cargo-credential`, we needed to do something and did one-off verification (#12623). `cargo-hack` recently gained the ability to automatically select MSRVs for each package allowing us to scale this up to the entire workspace. I don't know if we consciously chose an MSRV policy for `cargo-credential` but it looked like N-2 so that is what I stuck with and propagated out. - Without an aggressive sliding MSRV, we discourage people from using newer features because they will feel like they need permission which means it needs to be justified - Without an aggressive sliding MSRV, if the MSRV at one point in time works for someone, they tend to assume it will always work, leading to frustration at unmet expectations. I switched the MSRV check to `cargo check` from `cargo test` because I didn't want to deal with the out-of-diskspace issues and `check` will catch 99% of MSRV issues. Potential future improvements to `cargo-hack` - Allow `--version-range ..stable` so we can verify all MSRVs that aren't stable which would bypass the diskspace issues and allow us to more easily use `cargo test` again - Verify on a `cargo package` version of a crate (taiki-e/cargo-hack#216)
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -12,29 +12,59 @@
     {
       customType: 'regex',
       fileMatch: [
-        '^Cargo.toml$',
+        'Cargo.toml$',
       ],
       matchStrings: [
-        'rust-version.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
+        '\bMSRV:1\b.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
+        '(?<currentValue>\\d+\\.\\d+(\\.\\d+)?).*?\bMSRV:1\b',
       ],
-      depNameTemplate: 'latest-msrv',
+      depNameTemplate: 'MSRV:1',  // Support 1 version of rustc
+      packageNameTemplate: 'rust-lang/rust',
+      datasourceTemplate: 'github-releases',
+    },
+    {
+      customType: 'regex',
+      fileMatch: [
+        'Cargo.toml$',
+      ],
+      matchStrings: [
+        '\bMSRV:3\b.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
+        '(?<currentValue>\\d+\\.\\d+(\\.\\d+)?).*?\bMSRV:3\b',
+      ],
+      depNameTemplate: 'MSRV:3',  // Support 3 versions of rustc
       packageNameTemplate: 'rust-lang/rust',
       datasourceTemplate: 'github-releases',
     },
   ],
   packageRules: [
     {
-      commitMessageTopic: 'Latest MSRV',
+      commitMessageTopic: 'MSRV (1 version)',
+      matchManagers: [
+        'regex',
+      ],
+      matchPackageNames: [
+        'MSRV:1',
+      ],
+      schedule: [
+        '* * * * *',
+      ],
+      groupName: 'msrv',
+    },
+    {
+      commitMessageTopic: 'MSRV (3 versions)',
       matchManagers: [
         'regex',
       ],
       matchPackageNames: [
-        'latest-msrv',
+        'MSRV:3',
       ],
       "extractVersion": "^(?<version>\\d+\\.\\d+)",  // Drop the patch version
       schedule: [
         '* * * * *',
       ],
+      minimumReleaseAge: '85 days',  // 2 releases back * 6 weeks per release * 7 days per week + 1
+      internalChecksFilter: 'strict',
+      groupName: 'msrv',
     },
     // Goals:
     // - Rollup safe upgrades to reduce CI runner load
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
     needs:
     - build_std
     - clippy
-    - credential_msrv
+    - msrv
     - docs
     - lockfile
     - resolver
@@ -38,7 +38,7 @@ jobs:
     needs:
     - build_std
     - clippy
-    - credential_msrv
+    - msrv
     - docs
     - lockfile
     - resolver
@@ -249,9 +249,9 @@ jobs:
         curl -sSLO https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
         sh linkcheck.sh --all --path ../src/doc cargo
 
-  credential_msrv:
+  msrv:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - uses: taiki-e/install-action@cargo-hack
-    - run: cargo hack check --all-targets --rust-version -p cargo-credential
+    - run: cargo hack check --all-targets --rust-version --workspace --ignore-private
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ exclude = [
 ]
 
 [workspace.package]
-rust-version = "1.73"
+rust-version = "1.73"  # MSRV:1
 edition = "2021"
 license = "MIT OR Apache-2.0"
 
@@ -108,6 +108,7 @@ name = "cargo"
 version = "0.76.0"
 edition.workspace = true
 license.workspace = true
+rust-version.workspace = true
 homepage = "https://crates.io"
 repository = "https://github.com/rust-lang/cargo"
 documentation = "https://docs.rs/cargo"
diff --git a/crates/cargo-platform/Cargo.toml b/crates/cargo-platform/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cargo-platform"
-version = "0.1.5"
+version = "0.1.6"
 edition.workspace = true
 license.workspace = true
+rust-version = "1.70.0"  # MSRV:3
 homepage = "https://github.com/rust-lang/cargo"
 repository = "https://github.com/rust-lang/cargo"
 documentation = "https://docs.rs/cargo-platform"
diff --git a/crates/home/Cargo.toml b/crates/home/Cargo.toml
@@ -2,6 +2,7 @@
 name = "home"
 version = "0.5.8"
 authors = ["Brian Anderson <andersrb@gmail.com>"]
+rust-version = "1.70.0"  # MSRV:3
 documentation = "https://docs.rs/home"
 edition.workspace = true
 include = [
diff --git a/credential/cargo-credential-1password/Cargo.toml b/credential/cargo-credential-1password/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cargo-credential-1password"
-version = "0.4.0"
+version = "0.4.1"
 edition.workspace = true
 license.workspace = true
+rust-version = "1.70.0"  # MSRV:3
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens in a 1password vault."
 
diff --git a/credential/cargo-credential-libsecret/Cargo.toml b/credential/cargo-credential-libsecret/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cargo-credential-libsecret"
-version = "0.3.2"
+version = "0.3.3"
 edition.workspace = true
 license.workspace = true
+rust-version.workspace = true
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens with GNOME libsecret."
 
diff --git a/credential/cargo-credential-macos-keychain/Cargo.toml b/credential/cargo-credential-macos-keychain/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cargo-credential-macos-keychain"
-version = "0.3.1"
+version = "0.3.2"
 edition.workspace = true
 license.workspace = true
+rust-version.workspace = true
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens in a macOS keychain."
 
diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "cargo-credential-wincred"
-version = "0.3.1"
+version = "0.3.2"
 edition.workspace = true
 license.workspace = true
+rust-version.workspace = true
 repository = "https://github.com/rust-lang/cargo"
 description = "A Cargo credential process that stores tokens with Windows Credential Manager."
 
diff --git a/credential/cargo-credential/Cargo.toml b/credential/cargo-credential/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "cargo-credential"
-version = "0.4.0"
+version = "0.4.1"
 edition.workspace = true
 license.workspace = true
-rust-version = "1.70.0"
+rust-version = "1.70.0"  # MSRV:3
 repository = "https://github.com/rust-lang/cargo"
 description = "A library to assist writing Cargo credential helpers."
 
