Skip to content

feat: Strict solana cli version #131

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

Merged
merged 1 commit into from
Jun 17, 2025
Merged

feat: Strict solana cli version #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 18 additions & 22 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,32 +769,28 @@ pub fn build(
let (major, minor, patch) = get_pkg_version_from_cargo_lock("solana-program", &lockfile)?;

let mut solana_version: Option<String> = None;
let image: String = base_image.unwrap_or_else(|| {
if bpf_flag {
// Use this for backwards compatibility with anchor verified builds
solana_version = Some("v1.13.5".to_string());
"projectserum/build@sha256:75b75eab447ebcca1f471c98583d9b5d82c4be122c470852a022afcf9c98bead".to_string()
} else if let Some(digest) = IMAGE_MAP.get(&(major, minor, patch)) {
println!("Found docker image for Solana version {}.{}.{}", major, minor, patch);
let image: String = match base_image {
Some(base_image) => base_image,
None => {
if bpf_flag {
// Use this for backwards compatibility with anchor verified builds
solana_version = Some("v1.13.5".to_string());
"projectserum/build@sha256:75b75eab447ebcca1f471c98583d9b5d82c4be122c470852a022afcf9c98bead".to_string()
} else if let Some(digest) = IMAGE_MAP.get(&(major, minor, patch)) {
println!(
"Found docker image for Solana version {}.{}.{}",
major, minor, patch
);
solana_version = Some(format!("v{}.{}.{}", major, minor, patch));
format!("solanafoundation/solana-verifiable-build@{}", digest)
} else {
println!("Unable to find docker image for Solana version {}.{}.{}", major, minor, patch);
let prev = IMAGE_MAP.range(..(major, minor, patch)).next_back();
let next = IMAGE_MAP.range((major, minor, patch)..).next();
let (version, digest) = if let Some((version, digest)) = prev {
(version, digest)
} else if let Some((version, digest)) = next {
(version, digest)
} else {
println!("Unable to find backup docker image for Solana version {}.{}.{}", major, minor, patch);
std::process::exit(1);
};
println!("Using backup docker image for Solana version {}.{}.{}", version.0, version.1, version.2);
solana_version = Some(format!("v{}.{}.{}", version.0, version.1, version.2));
format!("solanafoundation/solana-verifiable-build@{}", digest)
return Err(anyhow!(format!(
"Unable to find docker image for Solana version {}.{}.{}",
major, minor, patch
)));
}
});
}
};

let mut manifest_path = None;

Expand Down
Loading