From fe883eafff9732d95a3998118ab7c8dea48d23bc Mon Sep 17 00:00:00 2001
From: Arrowana <Arrowana@users.noreply.github.com>
Date: Tue, 17 Dec 2024 11:51:30 +1100
Subject: [PATCH 1/2] fix: Anchor CLI ignore non semver releases to avoid panic

---
 cli/src/lib.rs | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 05e8434f23..1f8a962562 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -556,16 +556,16 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
 
     let cfg = Config::discover(cfg_override)?;
     if let Some(cfg) = cfg {
-        fn parse_version(text: &str) -> String {
-            Regex::new(r"(\d+\.\d+\.\S+)")
-                .unwrap()
-                .captures_iter(text)
-                .next()
-                .unwrap()
-                .get(0)
-                .unwrap()
-                .as_str()
-                .to_string()
+        fn parse_version(text: &str) -> Option<String> {
+            Some(
+                Regex::new(r"(\d+\.\d+\.\S+)")
+                    .unwrap()
+                    .captures_iter(text)
+                    .next()?
+                    .get(0)?
+                    .as_str()
+                    .to_string(),
+            )
         }
 
         fn get_current_version(cmd_name: &str) -> Result<String> {
@@ -577,7 +577,7 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
             }
 
             let output_version = std::str::from_utf8(&output.stdout)?;
-            let version = parse_version(output_version);
+            let version = parse_version(output_version).unwrap();
             Ok(version)
         }
 
@@ -633,9 +633,11 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
                     }
 
                     // Hide the installation progress if the version is already installed
-                    let is_installed = std::str::from_utf8(&output.stdout)?
-                        .lines()
-                        .any(|line| parse_version(line) == version);
+                    let is_installed = std::str::from_utf8(&output.stdout)?.lines().any(|line| {
+                        parse_version(line)
+                            .map(|line_version| line_version == version)
+                            .unwrap_or(false)
+                    });
                     let (stderr, stdout) = if is_installed {
                         (Stdio::null(), Stdio::null())
                     } else {

From 7682dd9218ab02446898d604a74e38db17ff0d40 Mon Sep 17 00:00:00 2001
From: Arrowana <Arrowana@users.noreply.github.com>
Date: Wed, 18 Dec 2024 18:00:13 +1100
Subject: [PATCH 2/2] avoid nesting, better error and changelog

---
 CHANGELOG.md   |  1 +
 cli/src/lib.rs | 13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad4184eb8b..db2631b24a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,6 +103,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - lang: Require `zero` accounts to be unique ([#3409](https://github.com/coral-xyz/anchor/pull/3409)).
 - lang: Deduplicate `zero` accounts against `init` accounts ([#3422](https://github.com/coral-xyz/anchor/pull/3422)).
 - cli: Fix custom `provider.cluster` ([#3428](https://github.com/coral-xyz/anchor/pull/3428)).
+- cli: Ignore non semver solana/agave releases to avoid panic ([#3432](https://github.com/coral-xyz/anchor/pull/3432)).
 
 ### Breaking
 
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index 1f8a962562..03ff43d19a 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -577,8 +577,8 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
             }
 
             let output_version = std::str::from_utf8(&output.stdout)?;
-            let version = parse_version(output_version).unwrap();
-            Ok(version)
+            parse_version(output_version)
+                .ok_or_else(|| anyhow!("Failed to parse the version of `{cmd_name}`"))
         }
 
         if let Some(solana_version) = &cfg.toolchain.solana_version {
@@ -633,11 +633,10 @@ fn override_toolchain(cfg_override: &ConfigOverride) -> Result<RestoreToolchainC
                     }
 
                     // Hide the installation progress if the version is already installed
-                    let is_installed = std::str::from_utf8(&output.stdout)?.lines().any(|line| {
-                        parse_version(line)
-                            .map(|line_version| line_version == version)
-                            .unwrap_or(false)
-                    });
+                    let is_installed = std::str::from_utf8(&output.stdout)?
+                        .lines()
+                        .filter_map(parse_version)
+                        .any(|line_version| line_version == version);
                     let (stderr, stdout) = if is_installed {
                         (Stdio::null(), Stdio::null())
                     } else {