Skip to content

Commit 0e06ec6

Browse files
authored
Unrolled build for #160144
Rollup merge of #160144 - marcoieni:update-all-lockfiles, r=Kobzol renovate: group lockfiles PRs r? @Kobzol
2 parents 8ab9fdf + 061c5bc commit 0e06ec6

1 file changed

Lines changed: 28 additions & 9 deletions

File tree

‎.github/renovate.json5‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,40 @@
3131
"dependencyDashboardApproval": false
3232
},
3333
{
34-
// Only maintain the Cargo lockfiles managed by update-lockfile.sh.
34+
// Update all Cargo.lock files except library/Cargo.lock in one PR.
3535
"matchManagers": ["cargo"],
3636
"matchUpdateTypes": ["lockFileMaintenance"],
37-
"enabled": false
37+
"groupName": "Cargo lock file maintenance",
38+
"commitMessageAction": "Cargo lock file maintenance"
39+
},
40+
{
41+
// Update library/Cargo.lock in a dedicated PR.
42+
"matchManagers": ["cargo"],
43+
"matchUpdateTypes": ["lockFileMaintenance"],
44+
"matchFileNames": ["library/Cargo.lock"],
45+
"groupName": "library lock file maintenance",
46+
"commitMessageAction": "Library lock file maintenance"
3847
},
3948
{
49+
// These packages don't have a committed Cargo.lock file.
4050
"matchManagers": ["cargo"],
4151
"matchUpdateTypes": ["lockFileMaintenance"],
4252
"matchFileNames": [
43-
"Cargo.toml",
44-
"library/Cargo.toml",
45-
"src/tools/rustbook/Cargo.toml"
53+
"library/rustc-std-workspace-*/Cargo.toml",
4654
],
47-
"enabled": true
55+
"enabled": false
56+
},
57+
{
58+
// Update yarn.lock in a dedicated PR.
59+
"matchManagers": ["npm"],
60+
"matchUpdateTypes": ["lockFileMaintenance"],
61+
"groupName": "Yarn lock file maintenance",
62+
"commitMessageAction": "Yarn lock file maintenance"
4863
}
4964
],
50-
// Don't manage dependencies inside subtrees. They are updated upstream and
51-
// synced in. See `src/doc/rustc-dev-guide/src/external-repos.md` for the list.
5265
"ignorePaths": [
66+
// Don't manage dependencies inside subtrees. They are updated upstream and
67+
// synced in. See `src/doc/rustc-dev-guide/src/external-repos.md` for the list.
5368
"compiler/rustc_codegen_cranelift/**",
5469
"compiler/rustc_codegen_gcc/**",
5570
"library/compiler-builtins/**",
@@ -59,6 +74,10 @@
5974
"src/tools/clippy/**",
6075
"src/tools/miri/**",
6176
"src/tools/rust-analyzer/**",
62-
"src/tools/rustfmt/**"
77+
"src/tools/rustfmt/**",
78+
79+
// Test manifests are fixtures; their versions and lockfiles may
80+
// intentionally be part of the test input.
81+
"tests/**",
6382
]
6483
}

0 commit comments

Comments
 (0)