Skip to content
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

Remove solana-install support for channels since it is already broken. #35606

Closed
wants to merge 2 commits into from
+4 −74
Closed

Remove solana-install support for channels since it is already broken. #35606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fabeb66
Remove solana-install support for channels since it is already broken.
willhickey Jul 17, 2024
a1475ff
Add deprecation warning and link to Agave Transition doc
willhickey Jul 19, 2024
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
77 changes: 3 additions & 74 deletions install/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,14 +586,6 @@ fn release_channel_download_url(release_channel: &str) -> String {
)
}

fn release_channel_version_url(release_channel: &str) -> String {
format!(
"https://release.solana.com/{}/solana-release-{}.yml",
release_channel,
crate::build_env::TARGET
)
}

fn print_update_manifest(update_manifest: &UpdateManifest) {
let when = Local
.timestamp_opt(update_manifest.timestamp_secs as i64, 0)
Expand Down Expand Up @@ -1026,72 +1018,9 @@ pub fn init_or_update(config_file: &str, is_init: bool, check_only: bool) -> Res
}
}
}
ExplicitRelease::Channel(release_channel) => {
let version_url = release_channel_version_url(release_channel);

let (_temp_dir, temp_file, _temp_archive_sha256) =
download_to_temp(&version_url, None)
.map_err(|err| format!("Unable to download {version_url}: {err}"))?;

let update_release_version = load_release_version(&temp_file)?;

let release_id = format!("{}-{}", release_channel, update_release_version.commit);
let release_dir = config.release_dir(&release_id);
let current_release_version_yml =
release_dir.join("solana-release").join("version.yml");

let download_url = release_channel_download_url(release_channel);

if !current_release_version_yml.exists() {
(
format!(
"{} commit {}",
release_channel,
&update_release_version.commit[0..7]
),
Some((download_url, None)),
release_dir,
)
} else {
let current_release_version =
load_release_version(&current_release_version_yml)?;
if update_release_version.commit == current_release_version.commit {
if let Ok(active_release_version) =
load_release_version(&config.active_release_dir().join("version.yml"))
{
if current_release_version.commit == active_release_version.commit {
// Same version, no update required
println!(
"Install is up to date. {} is the latest commit for {}",
&active_release_version.commit[0..7],
release_channel
);
return Ok(false);
}
}

// Release already present in the cache
(
format!(
"{} commit {}",
release_channel,
&update_release_version.commit[0..7]
),
None,
release_dir,
)
} else {
(
format!(
"{} (from {})",
&update_release_version.commit[0..7],
&current_release_version.commit[0..7],
),
Some((download_url, None)),
release_dir,
)
}
}
ExplicitRelease::Channel(_) => {
println!("Error: solana-install no longer supports installing by channel. Please specify a release version as vX.Y.Z.");
return Err("channel install no longer supported".to_string())
}
}
} else {
Expand Down
1 change: 1 addition & 0 deletions install/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
fn main() -> Result<(), String> {
println!("⚠️ solana-install is deprecated and will be discontinued when v1.18 is no longer supported. Please switch to Agave: https://github.com/anza-xyz/agave/wiki/Agave-Transition\n");
solana_install::main()
}
Loading