From 827d7a4d23b54dce51f1d1fb198bbd6cd2293abc Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 12 Feb 2024 15:34:23 -0700 Subject: [PATCH] [SOL] Check release bump against the Solana release --- crates/xtask-bump-check/src/xtask.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/xtask-bump-check/src/xtask.rs b/crates/xtask-bump-check/src/xtask.rs index b99ac8b3249..26a086dfa7f 100644 --- a/crates/xtask-bump-check/src/xtask.rs +++ b/crates/xtask-bump-check/src/xtask.rs @@ -158,6 +158,9 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes config.shell().status("Running", &cmd)?; cmd.exec()?; + // This test does not work for Solana because we are running + // it against a too old version of cargo. + #[cfg(target_os = "solana")] if let Some(referenced_commit) = referenced_commit.as_ref() { let mut cmd = ProcessBuilder::new("cargo"); cmd.arg("semver-checks") @@ -272,8 +275,8 @@ fn beta_and_stable_branch(repo: &git2::Repository) -> CargoResult<[git2::Branch< for branch in repo.branches(Some(git2::BranchType::Remote))? { let (branch, _) = branch?; let name = branch.name()?.unwrap(); - let Some((_, version)) = name.split_once("/rust-") else { - tracing::trace!("branch `{name}` is not in the format of `/rust-`"); + let Some((_, version)) = name.split_once("/solana-") else { + tracing::trace!("branch `{name}` is not in the format of `/solana-`"); continue; }; let Ok(version) = version.parse::() else {