Skip to content
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

Jump to bottom

fix: Set MSRV for internal packages #12381

Merged
merged 2 commits into from
Aug 24, 2023
Merged

fix: Set MSRV for internal packages #12381

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
7a65c82
fix: Set MSRV for internal packages
epage Jul 19, 2023
87b6e0e
chore: Automate updating of MSRV
epage Jul 19, 2023
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
26 changes: 26 additions & 0 deletions .github/renovate.json5
View file
Open in desktop
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+)?)',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'rust-version.*?(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)',
'rust-version\\s*=\\s*"(?<currentValue>\\d+\\.\\d+(\\.\\d+)?)"',

I would probably go with this slightly more specific regex, but I think it should work either way :)

I'm using something roughly similar in https://github.com/Turbo87/renovate-config/blob/04f6fb54cca78973deacec582fb36b4bf5f2da9c/rust/updateToolchain.json#L8

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I lean towards keeping it as-is.

Precisely specifying a regex can mean you over-specify it and might miss places silently.

If we err on the side of under-specifying a regex and accidentally pick up too much, it'll show up in the PR to be noticed.

],
depNameTemplate: 'latest-msrv',
packageNameTemplate: 'rust-lang/rust',
datasourceTemplate: 'github-releases',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just mind that 1.71.1 is not yet in GitHub Release.

},
],
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
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 @@ -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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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