Skip to content

Commit

Permalink
Auto merge of #13167 - weihanglo:bump-check-skip-home, r=epage
Browse files Browse the repository at this point in the history
chore(bump-check): dont check `home` against beta/stable branches
  • Loading branch information
bors committed Dec 14, 2023
2 parents 078a65b + 5163133 commit 6982b44
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions crates/xtask-bump-check/src/xtask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
let changed_members = changed(&ws, &repo, &base_commit, &head_commit)?;
let status = |msg: &str| config.shell().status(STATUS, msg);

// Don't check against beta and stable branches,
// as the publish of these crates are not tied with Rust release process.
// See `TO_PUBLISH` in publish.py.
let crates_not_check_against_channels = ["home"];

status(&format!("base commit `{}`", base_commit.id()))?;
status(&format!("head commit `{}`", head_commit.id()))?;

Expand All @@ -129,6 +134,11 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
status(&format!("compare against `{}`", referenced_commit.id()))?;
for referenced_member in checkout_ws(&ws, &repo, referenced_commit)?.members() {
let pkg_name = referenced_member.name().as_str();

if crates_not_check_against_channels.contains(&pkg_name) {
continue;
}

let Some(changed_member) = changed_members.get(pkg_name) else {
tracing::trace!("skipping {pkg_name}, may be removed or not published");
continue;
Expand Down Expand Up @@ -169,6 +179,9 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes
.args(&["--exclude", "rustfix"]) // FIXME: Remove once 1.76 is stable
.arg("--baseline-rev")
.arg(referenced_commit.id().to_string());
for krate in crates_not_check_against_channels {
cmd.args(&["--exclude", krate]);
}
config.shell().status("Running", &cmd)?;
cmd.exec()?;
}
Expand Down

0 comments on commit 6982b44

Please sign in to comment.