@@ -586,14 +586,6 @@ fn release_channel_download_url(release_channel: &str) -> String {
586586 )
587587}
588588
589- fn release_channel_version_url ( release_channel : & str ) -> String {
590- format ! (
591- "https://release.solana.com/{}/solana-release-{}.yml" ,
592- release_channel,
593- crate :: build_env:: TARGET
594- )
595- }
596-
597589fn print_update_manifest ( update_manifest : & UpdateManifest ) {
598590 let when = Local
599591 . timestamp_opt ( update_manifest. timestamp_secs as i64 , 0 )
@@ -1026,72 +1018,12 @@ pub fn init_or_update(config_file: &str, is_init: bool, check_only: bool) -> Res
10261018 }
10271019 }
10281020 }
1029- ExplicitRelease :: Channel ( release_channel) => {
1030- let version_url = release_channel_version_url ( release_channel) ;
1031-
1032- let ( _temp_dir, temp_file, _temp_archive_sha256) =
1033- download_to_temp ( & version_url, None )
1034- . map_err ( |err| format ! ( "Unable to download {version_url}: {err}" ) ) ?;
1035-
1036- let update_release_version = load_release_version ( & temp_file) ?;
1037-
1038- let release_id = format ! ( "{}-{}" , release_channel, update_release_version. commit) ;
1039- let release_dir = config. release_dir ( & release_id) ;
1040- let current_release_version_yml =
1041- release_dir. join ( "solana-release" ) . join ( "version.yml" ) ;
1042-
1043- let download_url = release_channel_download_url ( release_channel) ;
1044-
1045- if !current_release_version_yml. exists ( ) {
1046- (
1047- format ! (
1048- "{} commit {}" ,
1049- release_channel,
1050- & update_release_version. commit[ 0 ..7 ]
1051- ) ,
1052- Some ( ( download_url, None ) ) ,
1053- release_dir,
1054- )
1055- } else {
1056- let current_release_version =
1057- load_release_version ( & current_release_version_yml) ?;
1058- if update_release_version. commit == current_release_version. commit {
1059- if let Ok ( active_release_version) =
1060- load_release_version ( & config. active_release_dir ( ) . join ( "version.yml" ) )
1061- {
1062- if current_release_version. commit == active_release_version. commit {
1063- // Same version, no update required
1064- println ! (
1065- "Install is up to date. {} is the latest commit for {}" ,
1066- & active_release_version. commit[ 0 ..7 ] ,
1067- release_channel
1068- ) ;
1069- return Ok ( false ) ;
1070- }
1071- }
1072-
1073- // Release already present in the cache
1074- (
1075- format ! (
1076- "{} commit {}" ,
1077- release_channel,
1078- & update_release_version. commit[ 0 ..7 ]
1079- ) ,
1080- None ,
1081- release_dir,
1082- )
1083- } else {
1084- (
1085- format ! (
1086- "{} (from {})" ,
1087- & update_release_version. commit[ 0 ..7 ] ,
1088- & current_release_version. commit[ 0 ..7 ] ,
1089- ) ,
1090- Some ( ( download_url, None ) ) ,
1091- release_dir,
1092- )
1093- }
1094- }
1021+ ExplicitRelease :: Channel ( _) => {
1022+ return Err (
1023+ "solana-install no longer supports installing by channel. Please specify \
1024+ a release version as vX.Y.Z."
1025+ . to_string ( )
1026+ )
10951027 }
10961028 }
10971029 } else {
0 commit comments