Skip to content

Commit 6982b44

Browse files
committed
Auto merge of #13167 - weihanglo:bump-check-skip-home, r=epage
chore(bump-check): dont check `home` against beta/stable branches
2 parents 078a65b + 5163133 commit 6982b44

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

crates/xtask-bump-check/src/xtask.rs

+13
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
118118
let changed_members = changed(&ws, &repo, &base_commit, &head_commit)?;
119119
let status = |msg: &str| config.shell().status(STATUS, msg);
120120

121+
// Don't check against beta and stable branches,
122+
// as the publish of these crates are not tied with Rust release process.
123+
// See `TO_PUBLISH` in publish.py.
124+
let crates_not_check_against_channels = ["home"];
125+
121126
status(&format!("base commit `{}`", base_commit.id()))?;
122127
status(&format!("head commit `{}`", head_commit.id()))?;
123128

@@ -129,6 +134,11 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
129134
status(&format!("compare against `{}`", referenced_commit.id()))?;
130135
for referenced_member in checkout_ws(&ws, &repo, referenced_commit)?.members() {
131136
let pkg_name = referenced_member.name().as_str();
137+
138+
if crates_not_check_against_channels.contains(&pkg_name) {
139+
continue;
140+
}
141+
132142
let Some(changed_member) = changed_members.get(pkg_name) else {
133143
tracing::trace!("skipping {pkg_name}, may be removed or not published");
134144
continue;
@@ -169,6 +179,9 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
169179
.args(&["--exclude", "rustfix"]) // FIXME: Remove once 1.76 is stable
170180
.arg("--baseline-rev")
171181
.arg(referenced_commit.id().to_string());
182+
for krate in crates_not_check_against_channels {
183+
cmd.args(&["--exclude", krate]);
184+
}
172185
config.shell().status("Running", &cmd)?;
173186
cmd.exec()?;
174187
}

0 commit comments

Comments
 (0)