From 680afc7040877f69d306aa3eb2aed6e0e87fba89 Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Sun, 26 Jan 2025 10:49:33 +0100
Subject: [PATCH 01/21] feat: add git provider and detection

---
 src/task/task_file_providers/mod.rs           |   9 +-
 .../task_file_providers/remote_task_git.rs    | 209 ++++++++++++++++++
 .../task_file_providers/remote_task_http.rs   |  15 +-
 3 files changed, 225 insertions(+), 8 deletions(-)
 create mode 100644 src/task/task_file_providers/remote_task_git.rs

diff --git a/src/task/task_file_providers/mod.rs b/src/task/task_file_providers/mod.rs
index 37a364bd26..34e619bc67 100644
--- a/src/task/task_file_providers/mod.rs
+++ b/src/task/task_file_providers/mod.rs
@@ -1,9 +1,11 @@
 use std::{fmt::Debug, path::PathBuf};
 
 mod local_task;
+mod remote_task_git;
 mod remote_task_http;
 
-pub use local_task::LocalTask;
+use local_task::LocalTask;
+use remote_task_git::RemoteTaskGitBuilder;
 use remote_task_http::RemoteTaskHttpBuilder;
 
 pub trait TaskFileProvider: Debug {
@@ -41,6 +43,11 @@ impl TaskFileProviders {
 
     fn get_providers(&self) -> Vec<Box<dyn TaskFileProvider>> {
         vec![
+            Box::new(
+                RemoteTaskGitBuilder::new()
+                    .with_cache(self.use_cache)
+                    .build(),
+            ),
             Box::new(
                 RemoteTaskHttpBuilder::new()
                     .with_cache(self.use_cache)
diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
new file mode 100644
index 0000000000..8c31794e58
--- /dev/null
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -0,0 +1,209 @@
+use std::path::PathBuf;
+
+use regex::Regex;
+
+use crate::{dirs, env};
+
+use super::TaskFileProvider;
+
+#[derive(Debug)]
+pub struct RemoteTaskGitBuilder {
+    store_path: PathBuf,
+    use_cache: bool,
+}
+
+impl RemoteTaskGitBuilder {
+    pub fn new() -> Self {
+        Self {
+            store_path: env::temp_dir(),
+            use_cache: false,
+        }
+    }
+
+    pub fn with_cache(mut self, use_cache: bool) -> Self {
+        if use_cache {
+            self.store_path = dirs::CACHE.join("remote-git-tasks-cache");
+            self.use_cache = true;
+        }
+        self
+    }
+
+    pub fn build(self) -> RemoteTaskGit {
+        RemoteTaskGit {
+            storage_path: self.store_path,
+            is_cached: self.use_cache,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct RemoteTaskGit {
+    storage_path: PathBuf,
+    is_cached: bool,
+}
+
+struct GitRepoStructure {
+    url: String,
+    user: Option<String>,
+    host: String,
+    repo: String,
+    query: Option<String>,
+    path: String,
+}
+
+impl GitRepoStructure {
+    pub fn new(
+        url: &str,
+        user: Option<String>,
+        host: &str,
+        repo: &str,
+        query: Option<String>,
+        path: &str,
+    ) -> Self {
+        Self {
+            url: url.to_string(),
+            user,
+            host: host.to_string(),
+            repo: repo.to_string(),
+            query,
+            path: path.to_string(),
+        }
+    }
+}
+
+impl RemoteTaskGit {
+    fn get_cache_key(&self, file: &str) -> String {
+        "".to_string()
+    }
+
+    fn detect_ssh(&self, file: &str) -> Result<GitRepoStructure, Box<dyn std::error::Error>> {
+        let re = Regex::new(r"^git::ssh://((?P<user>[^@]+)@)(?P<host>[^/]+)/(?P<repo>[^/]+)\.git//(?P<path>[^?]+)(\?(?P<query>[^?]+))?$").unwrap();
+
+        if !re.is_match(file) {
+            return Err("Invalid SSH URL".into());
+        }
+
+        let captures = re.captures(file).unwrap();
+
+        Ok(GitRepoStructure::new(
+            file,
+            Some(captures.name("user").unwrap().as_str().to_string()),
+            captures.name("host").unwrap().as_str(),
+            captures.name("repo").unwrap().as_str(),
+            captures.name("query").map(|m| m.as_str().to_string()),
+            captures.name("path").unwrap().as_str(),
+        ))
+    }
+
+    fn detect_https(&self, file: &str) -> Result<GitRepoStructure, Box<dyn std::error::Error>> {
+        let re = Regex::new(r"^git::https://(?P<host>[^/]+)/(?P<repo>[^/]+(?:/[^/]+)?)\.git//(?P<path>[^?]+)(\?(?P<query>[^?]+))?$").unwrap();
+
+        if !re.is_match(file) {
+            return Err("Invalid HTTPS URL".into());
+        }
+
+        let captures = re.captures(file).unwrap();
+
+        Ok(GitRepoStructure::new(
+            file,
+            None,
+            captures.name("host").unwrap().as_str(),
+            captures.name("repo").unwrap().as_str(),
+            captures.name("query").map(|m| m.as_str().to_string()),
+            captures.name("path").unwrap().as_str(),
+        ))
+    }
+}
+
+impl TaskFileProvider for RemoteTaskGit {
+    fn is_match(&self, file: &str) -> bool {
+        if self.detect_ssh(file).is_ok() {
+            return true;
+        }
+
+        if self.detect_https(file).is_ok() {
+            return true;
+        }
+
+        false
+    }
+
+    fn get_local_path(&self, file: &str) -> Result<PathBuf, Box<dyn std::error::Error>> {
+        Ok(PathBuf::new())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn test_valid_detect_ssh() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases = vec![
+            "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+            "git::ssh://git@github.com:myorg/example.git//terraform/myfile?ref=master",
+            "git::ssh://git@github.com:myorg/example.git//terraform/myfile?depth=1",
+            "git::ssh://git@myserver.com/example.git//terraform/myfile",
+            "git::ssh://user@myserver.com/example.git//myfile?ref=master",
+        ];
+
+        for url in test_cases {
+            let result = remote_task_git.detect_ssh(url);
+            assert!(result.is_ok());
+        }
+    }
+
+    #[test]
+    fn test_invalid_detect_ssh() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases = vec![
+            "git::ssh://myserver.com/example.git//myfile?ref=master",
+            "git::ssh://user@myserver.com/example.git?ref=master",
+            "git::ssh://user@myserver.com/example.git",
+            "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+        ];
+
+        for url in test_cases {
+            let result = remote_task_git.detect_ssh(url);
+            assert!(result.is_err());
+        }
+    }
+
+    #[test]
+    fn test_valid_detect_https() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases = vec![
+            "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+            "git::https://github.com/myorg/example.git//terraform/myfile?ref=master",
+            "git::https://github.com/myorg/example.git//terraform/myfile?depth=1",
+            "git::https://myserver.com/example.git//terraform/myfile",
+            "git::https://myserver.com/example.git//myfile?ref=master",
+        ];
+
+        for url in test_cases {
+            let result = remote_task_git.detect_https(url);
+            assert!(result.is_ok());
+        }
+    }
+
+    #[test]
+    fn test_invalid_detect_https() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases = vec![
+            "git::https://myserver.com/example.git?ref=master",
+            "git::https://user@myserver.com/example.git",
+            "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+        ];
+
+        for url in test_cases {
+            let result = remote_task_git.detect_https(url);
+            assert!(result.is_err());
+        }
+    }
+}
diff --git a/src/task/task_file_providers/remote_task_http.rs b/src/task/task_file_providers/remote_task_http.rs
index 18aecd0a7b..ada6e71885 100644
--- a/src/task/task_file_providers/remote_task_http.rs
+++ b/src/task/task_file_providers/remote_task_http.rs
@@ -161,13 +161,13 @@ mod tests {
     #[test]
     fn test_http_remote_task_get_local_path_with_cache() {
         let paths = vec![
-            ("/myfile.py", "myfile.py"),
-            ("/subpath/myfile.sh", "myfile.sh"),
-            ("/myfile.sh?query=1&sdfsdf=2", "myfile.sh"),
+            "/myfile.py",
+            "/subpath/myfile.sh",
+            "/myfile.sh?query=1&sdfsdf=2",
         ];
         let mut server = mockito::Server::new();
 
-        for (request_path, not_expected_file_name) in paths {
+        for request_path in paths {
             let mocked_server = server
                 .mock("GET", request_path)
                 .with_status(200)
@@ -176,13 +176,14 @@ mod tests {
                 .create();
 
             let provider = RemoteTaskHttpBuilder::new().with_cache(true).build();
-            let mock = format!("{}{}", server.url(), request_path);
+            let request_url = format!("{}{}", server.url(), request_path);
+            let cache_key = provider.get_cache_key(&request_url);
 
             for _ in 0..2 {
-                let path = provider.get_local_path(&mock).unwrap();
+                let path = provider.get_local_path(&request_url).unwrap();
                 assert!(path.exists());
                 assert!(path.is_file());
-                assert!(!path.ends_with(not_expected_file_name));
+                assert!(path.ends_with(&cache_key));
             }
 
             mocked_server.assert();

From 632413247975e59221cf47b028f7c9a16b44aba9 Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Sun, 26 Jan 2025 11:24:52 +0100
Subject: [PATCH 02/21] fix: unit tests

---
 src/task/task_file_providers/mod.rs | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/task/task_file_providers/mod.rs b/src/task/task_file_providers/mod.rs
index 34e619bc67..4e39ff0380 100644
--- a/src/task/task_file_providers/mod.rs
+++ b/src/task/task_file_providers/mod.rs
@@ -71,7 +71,7 @@ mod tests {
     fn test_get_providers() {
         let task_file_providers = TaskFileProvidersBuilder::new().build();
         let providers = task_file_providers.get_providers();
-        assert_eq!(providers.len(), 2);
+        assert_eq!(providers.len(), 3);
     }
 
     #[test]
@@ -82,7 +82,8 @@ mod tests {
         for file in cases {
             let provider = task_file_providers.get_provider(file);
             assert!(provider.is_some());
-            assert!(format!("{:?}", provider.unwrap()).contains("LocalTask"));
+            let provider_name = format!("{:?}", provider.unwrap());
+            assert!(provider_name.contains("LocalTask"));
         }
     }
 
@@ -98,7 +99,26 @@ mod tests {
         for file in cases {
             let provider = task_file_providers.get_provider(file);
             assert!(provider.is_some());
-            assert!(format!("{:?}", provider.unwrap()).contains("RemoteTaskHttp"));
+            let provider_name = format!("{:?}", provider.unwrap());
+            assert!(provider_name.contains("RemoteTaskHttp"));
+        }
+    }
+
+    #[test]
+    fn test_git_file_match_git_remote_task_provider() {
+        let task_file_providers = TaskFileProvidersBuilder::new().build();
+        let cases = vec![
+            "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+            "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+            "git::ssh://user@myserver.com/example.git//subfolder/myfile.py",
+            "git::https://myserver.com/example.git//subfolder/myfile.sh",
+        ];
+
+        for file in cases {
+            let provider = task_file_providers.get_provider(file);
+            assert!(provider.is_some());
+            let provider_name = format!("{:?}", provider.unwrap());
+            assert!(provider_name.contains("RemoteTaskGit"));
         }
     }
 }

From 3558e3236085ec25f94786b134658c89ba017356 Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Sun, 26 Jan 2025 13:29:30 +0100
Subject: [PATCH 03/21] fix: unit tests

---
 .../task_file_providers/remote_task_git.rs    | 155 ++++++++++++++----
 1 file changed, 119 insertions(+), 36 deletions(-)

diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
index 8c31794e58..3b83ba792d 100644
--- a/src/task/task_file_providers/remote_task_git.rs
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -1,8 +1,9 @@
 use std::path::PathBuf;
 
 use regex::Regex;
+use xx::git;
 
-use crate::{dirs, env};
+use crate::{dirs, env, hash};
 
 use super::TaskFileProvider;
 
@@ -42,38 +43,33 @@ pub struct RemoteTaskGit {
     is_cached: bool,
 }
 
+#[derive(Debug, Clone)]
 struct GitRepoStructure {
     url: String,
-    user: Option<String>,
-    host: String,
-    repo: String,
-    query: Option<String>,
+    url_without_path: String,
     path: String,
 }
 
 impl GitRepoStructure {
-    pub fn new(
-        url: &str,
-        user: Option<String>,
-        host: &str,
-        repo: &str,
-        query: Option<String>,
-        path: &str,
-    ) -> Self {
+    pub fn new(url: &str, url_without_path: &str, path: &str) -> Self {
         Self {
             url: url.to_string(),
-            user,
-            host: host.to_string(),
-            repo: repo.to_string(),
-            query,
+            url_without_path: url_without_path.to_string(),
             path: path.to_string(),
         }
     }
 }
 
 impl RemoteTaskGit {
-    fn get_cache_key(&self, file: &str) -> String {
-        "".to_string()
+    fn get_cache_key(&self, repo_structure: &GitRepoStructure) -> String {
+        hash::hash_sha256_to_str(&repo_structure.url_without_path)
+    }
+
+    fn get_repo_structure(&self, file: &str) -> GitRepoStructure {
+        if self.detect_ssh(file).is_ok() {
+            return self.detect_ssh(file).unwrap();
+        }
+        self.detect_https(file).unwrap()
     }
 
     fn detect_ssh(&self, file: &str) -> Result<GitRepoStructure, Box<dyn std::error::Error>> {
@@ -85,14 +81,9 @@ impl RemoteTaskGit {
 
         let captures = re.captures(file).unwrap();
 
-        Ok(GitRepoStructure::new(
-            file,
-            Some(captures.name("user").unwrap().as_str().to_string()),
-            captures.name("host").unwrap().as_str(),
-            captures.name("repo").unwrap().as_str(),
-            captures.name("query").map(|m| m.as_str().to_string()),
-            captures.name("path").unwrap().as_str(),
-        ))
+        let path = captures.name("path").unwrap().as_str();
+
+        Ok(GitRepoStructure::new(file, &file.replace(path, ""), path))
     }
 
     fn detect_https(&self, file: &str) -> Result<GitRepoStructure, Box<dyn std::error::Error>> {
@@ -104,14 +95,9 @@ impl RemoteTaskGit {
 
         let captures = re.captures(file).unwrap();
 
-        Ok(GitRepoStructure::new(
-            file,
-            None,
-            captures.name("host").unwrap().as_str(),
-            captures.name("repo").unwrap().as_str(),
-            captures.name("query").map(|m| m.as_str().to_string()),
-            captures.name("path").unwrap().as_str(),
-        ))
+        let path = captures.name("path").unwrap().as_str();
+
+        Ok(GitRepoStructure::new(file, &file.replace(path, ""), path))
     }
 }
 
@@ -129,7 +115,32 @@ impl TaskFileProvider for RemoteTaskGit {
     }
 
     fn get_local_path(&self, file: &str) -> Result<PathBuf, Box<dyn std::error::Error>> {
-        Ok(PathBuf::new())
+        let repo_structure = self.get_repo_structure(file);
+        let cache_key = self.get_cache_key(&repo_structure);
+        let destination = self.storage_path.join(&cache_key);
+        let repo_file_path = repo_structure.path.clone();
+        let full_path = destination.join(&repo_file_path);
+
+        match self.is_cached {
+            true => {
+                trace!("Cache mode enabled");
+
+                if full_path.exists() {
+                    return Ok(full_path);
+                }
+            }
+            false => {
+                trace!("Cache mode disabled");
+
+                if full_path.exists() {
+                    crate::file::remove_dir(full_path)?;
+                }
+            }
+        }
+
+        let git_cloned = git::clone(repo_structure.url.as_str(), destination)?;
+
+        Ok(git_cloned.dir.join(&repo_file_path))
     }
 }
 
@@ -206,4 +217,76 @@ mod tests {
             assert!(result.is_err());
         }
     }
+
+    #[test]
+    fn test_compare_ssh_get_cache_key() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases = vec![
+            (
+                "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+                "git::ssh://git@github.com:myorg/example.git//myfile?ref=v2.0.0",
+                false,
+            ),
+            (
+                "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+                "git::ssh://user@myserver.com/example.git//myfile?ref=master",
+                false,
+            ),
+            (
+                "git::ssh://git@github.com/example.git//myfile?ref=v1.0.0",
+                "git::ssh://git@github.com/example.git//subfolder/mysecondfile?ref=v1.0.0",
+                true,
+            ),
+            (
+                "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+                "git::ssh://git@github.com:myorg/example.git//subfolder/mysecondfile?ref=v1.0.0",
+                true,
+            ),
+        ];
+
+        for (first_url, second_url, expected) in test_cases {
+            let first_repo = remote_task_git.detect_ssh(first_url).unwrap();
+            let second_repo = remote_task_git.detect_ssh(second_url).unwrap();
+            let first_cache_key = remote_task_git.get_cache_key(&first_repo);
+            let second_cache_key = remote_task_git.get_cache_key(&second_repo);
+            assert_eq!(expected, first_cache_key == second_cache_key);
+        }
+    }
+
+    #[test]
+    fn test_compare_https_get_cache_key() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases = vec![
+            (
+                "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+                "git::https://github.com/myorg/example.git//myfile?ref=v2.0.0",
+                false,
+            ),
+            (
+                "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+                "git::https://bitbucket.com/myorg/example.git//myfile?ref=v1.0.0",
+                false,
+            ),
+            (
+                "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+                "git::https://github.com/myorg/example.git//subfolder/myfile?ref=v1.0.0",
+                true,
+            ),
+            (
+                "git::https://github.com/example.git//myfile?ref=v1.0.0",
+                "git::https://github.com/example.git//subfolder/myfile?ref=v1.0.0",
+                true,
+            ),
+        ];
+
+        for (first_url, second_url, expected) in test_cases {
+            let first_repo = remote_task_git.detect_https(first_url).unwrap();
+            let second_repo = remote_task_git.detect_https(second_url).unwrap();
+            let first_cache_key = remote_task_git.get_cache_key(&first_repo);
+            let second_cache_key = remote_task_git.get_cache_key(&second_repo);
+            assert_eq!(expected, first_cache_key == second_cache_key);
+        }
+    }
 }

From eb8f27c6bfc3b439e61b9a76ebc13173f4be4556 Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Sun, 26 Jan 2025 13:48:15 +0100
Subject: [PATCH 04/21] feat: refacto some code

---
 .../task_file_providers/remote_task_git.rs    |  1 +
 .../task_file_providers/remote_task_http.rs   | 36 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
index 3b83ba792d..3fbf6337a6 100644
--- a/src/task/task_file_providers/remote_task_git.rs
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -126,6 +126,7 @@ impl TaskFileProvider for RemoteTaskGit {
                 trace!("Cache mode enabled");
 
                 if full_path.exists() {
+                    debug!("Using cached file: {:?}", full_path);
                     return Ok(full_path);
                 }
             }
diff --git a/src/task/task_file_providers/remote_task_http.rs b/src/task/task_file_providers/remote_task_http.rs
index ada6e71885..5c2394127d 100644
--- a/src/task/task_file_providers/remote_task_http.rs
+++ b/src/task/task_file_providers/remote_task_http.rs
@@ -50,6 +50,7 @@ impl RemoteTaskHttp {
         file: &str,
         destination: &PathBuf,
     ) -> Result<(), Box<dyn std::error::Error>> {
+        trace!("Downloading file: {}", file);
         HTTP.download_file(file, destination, None)?;
         file::make_executable(destination)?;
         Ok(())
@@ -71,37 +72,29 @@ impl TaskFileProvider for RemoteTaskHttp {
     }
 
     fn get_local_path(&self, file: &str) -> Result<PathBuf, Box<dyn std::error::Error>> {
+        let cache_key = self.get_cache_key(file);
+        let destination = self.storage_path.join(&cache_key);
+
         match self.is_cached {
             true => {
                 trace!("Cache mode enabled");
-                let cache_key = self.get_cache_key(file);
-                let destination = self.storage_path.join(&cache_key);
 
                 if destination.exists() {
                     debug!("Using cached file: {:?}", destination);
                     return Ok(destination);
                 }
-
-                debug!("Downloading file: {}", file);
-                self.download_file(file, &destination)?;
-                Ok(destination)
             }
             false => {
                 trace!("Cache mode disabled");
-                let url = url::Url::parse(file)?;
-                let filename = url
-                    .path_segments()
-                    .and_then(|segments| segments.last())
-                    .unwrap();
 
-                let destination = env::temp_dir().join(filename);
                 if destination.exists() {
                     file::remove_file(&destination)?;
                 }
-                self.download_file(file, &destination)?;
-                Ok(destination)
             }
         }
+
+        self.download_file(file, &destination)?;
+        Ok(destination)
     }
 }
 
@@ -130,13 +123,13 @@ mod tests {
     #[test]
     fn test_http_remote_task_get_local_path_without_cache() {
         let paths = vec![
-            ("/myfile.py", "myfile.py"),
-            ("/subpath/myfile.sh", "myfile.sh"),
-            ("/myfile.sh?query=1&sdfsdf=2", "myfile.sh"),
+            "/myfile.py",
+            "/subpath/myfile.sh",
+            "/myfile.sh?query=1&sdfsdf=2",
         ];
         let mut server = mockito::Server::new();
 
-        for (request_path, expected_file_name) in paths {
+        for request_path in paths {
             let mocked_server: mockito::Mock = server
                 .mock("GET", request_path)
                 .with_status(200)
@@ -145,13 +138,14 @@ mod tests {
                 .create();
 
             let provider = RemoteTaskHttpBuilder::new().build();
-            let mock = format!("{}{}", server.url(), request_path);
+            let request_url = format!("{}{}", server.url(), request_path);
+            let cache_key = provider.get_cache_key(&request_url);
 
             for _ in 0..2 {
-                let local_path = provider.get_local_path(&mock).unwrap();
+                let local_path = provider.get_local_path(&request_url).unwrap();
                 assert!(local_path.exists());
                 assert!(local_path.is_file());
-                assert!(local_path.ends_with(expected_file_name));
+                assert!(local_path.ends_with(&cache_key));
             }
 
             mocked_server.assert();

From 9beb58bd24b878be91256761a3ab588f92b8199e Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Sun, 26 Jan 2025 14:05:11 +0100
Subject: [PATCH 05/21] feat: documentation

---
 docs/tasks/toml-tasks.md | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/docs/tasks/toml-tasks.md b/docs/tasks/toml-tasks.md
index 4200c15239..dd7be7f4af 100644
--- a/docs/tasks/toml-tasks.md
+++ b/docs/tasks/toml-tasks.md
@@ -334,13 +334,47 @@ file = 'scripts/release.sh' # execute an external script
 
 ### Remote tasks
 
-Task files can be fetched via http:
+Task files can be fetched remotely with multiple protocols:
+
+#### HTTP
 
 ```toml
 [tasks.build]
 file = "https://example.com/build.sh"
 ```
 
+Please note that the file will be downloaded and executed. Make sure you trust the source.
+
+#### Git
+
+::: code-group
+
+```toml [ssh]
+[tasks.build]
+file = "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0"
+```
+
+```toml [https]
+[tasks.build]
+file = "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0"
+```
+
+:::
+
+Url format must follow these patterns `git::<protocol>://<url>//<path>?<query>`
+
+Required fields:
+
+- `protocol`: The git repository URL.
+- `url`: The git repository URL.
+- `path`: The path to the file in the repository.
+
+Optional fields:
+
+- `query`: The git reference (branch, tag, commit).
+
+#### Cache
+
 Each task file is cached in the `MISE_CACHE_DIR` directory. If the file is updated, it will not be re-downloaded unless the cache is cleared.
 
 :::tip

From dfe8174881f9e8e23f5d78d1ea5d528a17626cc8 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 1 Feb 2025 13:50:51 +0100
Subject: [PATCH 06/21] fix: code and add e2e

---
 e2e/tasks/test_task_remote_git_ssh            |  44 ++++++++
 .../task_file_providers/remote_task_git.rs    | 101 ++++++++++++++++--
 2 files changed, 134 insertions(+), 11 deletions(-)
 create mode 100755 e2e/tasks/test_task_remote_git_ssh

diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
new file mode 100755
index 0000000000..ac08bd0404
--- /dev/null
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+REMOTE_CACHED_TASKS_DIR="$MISE_CACHE_DIR/remote-git-tasks-cache"
+
+count_dirs() {
+  find "$REMOTE_CACHED_TASKS_DIR" -mindepth 1 -maxdepth 1 -type d | wc -l
+}
+
+list_dirs() {
+  find "$REMOTE_CACHED_TASKS_DIR" -mindepth 1 -maxdepth 1 -type d
+}
+
+#################################################################################
+# Test remote tasks with no ref
+#################################################################################
+
+cat <<EOF >mise.toml
+[tasks.remote_lint_ssh_latest]
+file  = "git::ssh://git@github.com:jdx/mise.git//xtasks/lint/clippy"
+EOF
+
+assert_contains "mise tasks" "remote_lint_ssh_latest"
+assert_succeed "mise run remote_lint_ssh_latest" # Remote task should be downloaded
+assert_equals "$(count_dirs)" "1"
+
+mise cache clear # Clear cache to force redownload
+
+assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_latest" # Remote task should be redownloaded
+assert_equals "$(count_dirs)" "1"
+
+assert_succeed "mise run remote_lint_ssh_latest --no-cache" # Remote task should be redownloaded
+assert_equals "$(count_dirs)" "1"
+cache_before=$(list_dirs)
+
+assert_succeed "mise run remote_lint_ssh_latest" # Cache should be used
+assert_equals "$(count_dirs)" "1"
+cache_after=$(list_dirs)
+assert_succeed "diff $cache_before $cache_after"
+
+#################################################################################
+# Test remote tasks with with ref
+#################################################################################
+
+# TODO: Add test for remote task with ref
diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
index 3fbf6337a6..9b5265d240 100644
--- a/src/task/task_file_providers/remote_task_git.rs
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -45,24 +45,29 @@ pub struct RemoteTaskGit {
 
 #[derive(Debug, Clone)]
 struct GitRepoStructure {
-    url: String,
     url_without_path: String,
     path: String,
+    branch: Option<String>,
 }
 
 impl GitRepoStructure {
-    pub fn new(url: &str, url_without_path: &str, path: &str) -> Self {
+    pub fn new(url_without_path: &str, path: &str, branch: Option<String>) -> Self {
         Self {
-            url: url.to_string(),
             url_without_path: url_without_path.to_string(),
             path: path.to_string(),
+            branch,
         }
     }
 }
 
 impl RemoteTaskGit {
     fn get_cache_key(&self, repo_structure: &GitRepoStructure) -> String {
-        hash::hash_sha256_to_str(&repo_structure.url_without_path)
+        let key = format!(
+            "{}{}",
+            &repo_structure.url_without_path,
+            &repo_structure.branch.to_owned().unwrap_or("".to_string())
+        );
+        hash::hash_sha256_to_str(&key)
     }
 
     fn get_repo_structure(&self, file: &str) -> GitRepoStructure {
@@ -73,7 +78,7 @@ impl RemoteTaskGit {
     }
 
     fn detect_ssh(&self, file: &str) -> Result<GitRepoStructure, Box<dyn std::error::Error>> {
-        let re = Regex::new(r"^git::ssh://((?P<user>[^@]+)@)(?P<host>[^/]+)/(?P<repo>[^/]+)\.git//(?P<path>[^?]+)(\?(?P<query>[^?]+))?$").unwrap();
+        let re = Regex::new(r"^git::ssh://(?P<url>((?P<user>[^@]+)@)(?P<host>[^/]+)/(?P<repo>[^/]+)\.git)//(?P<path>[^?]+)(\?ref=(?P<branch>[^?]+))?$").unwrap();
 
         if !re.is_match(file) {
             return Err("Invalid SSH URL".into());
@@ -81,13 +86,17 @@ impl RemoteTaskGit {
 
         let captures = re.captures(file).unwrap();
 
+        let url_without_path = captures.name("url").unwrap().as_str();
+
         let path = captures.name("path").unwrap().as_str();
 
-        Ok(GitRepoStructure::new(file, &file.replace(path, ""), path))
+        let branch: Option<String> = captures.name("branch").map(|m| m.as_str().to_string());
+
+        Ok(GitRepoStructure::new(url_without_path, path, branch))
     }
 
     fn detect_https(&self, file: &str) -> Result<GitRepoStructure, Box<dyn std::error::Error>> {
-        let re = Regex::new(r"^git::https://(?P<host>[^/]+)/(?P<repo>[^/]+(?:/[^/]+)?)\.git//(?P<path>[^?]+)(\?(?P<query>[^?]+))?$").unwrap();
+        let re = Regex::new(r"^git::(?P<url>https://(?P<host>[^/]+)/(?P<repo>[^/]+(?:/[^/]+)?)\.git)//(?P<path>[^?]+)(\?ref=(?P<branch>[^?]+))?$").unwrap();
 
         if !re.is_match(file) {
             return Err("Invalid HTTPS URL".into());
@@ -95,9 +104,13 @@ impl RemoteTaskGit {
 
         let captures = re.captures(file).unwrap();
 
+        let url_without_path = captures.name("url").unwrap().as_str();
+
         let path = captures.name("path").unwrap().as_str();
 
-        Ok(GitRepoStructure::new(file, &file.replace(path, ""), path))
+        let branch: Option<String> = captures.name("branch").map(|m| m.as_str().to_string());
+
+        Ok(GitRepoStructure::new(url_without_path, path, branch))
     }
 }
 
@@ -121,6 +134,8 @@ impl TaskFileProvider for RemoteTaskGit {
         let repo_file_path = repo_structure.path.clone();
         let full_path = destination.join(&repo_file_path);
 
+        debug!("Repo structure: {:?}", repo_structure);
+
         match self.is_cached {
             true => {
                 trace!("Cache mode enabled");
@@ -139,7 +154,7 @@ impl TaskFileProvider for RemoteTaskGit {
             }
         }
 
-        let git_cloned = git::clone(repo_structure.url.as_str(), destination)?;
+        let git_cloned = git::clone(repo_structure.url_without_path.as_str(), destination)?;
 
         Ok(git_cloned.dir.join(&repo_file_path))
     }
@@ -157,7 +172,6 @@ mod tests {
         let test_cases = vec![
             "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
             "git::ssh://git@github.com:myorg/example.git//terraform/myfile?ref=master",
-            "git::ssh://git@github.com:myorg/example.git//terraform/myfile?depth=1",
             "git::ssh://git@myserver.com/example.git//terraform/myfile",
             "git::ssh://user@myserver.com/example.git//myfile?ref=master",
         ];
@@ -192,7 +206,6 @@ mod tests {
         let test_cases = vec![
             "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
             "git::https://github.com/myorg/example.git//terraform/myfile?ref=master",
-            "git::https://github.com/myorg/example.git//terraform/myfile?depth=1",
             "git::https://myserver.com/example.git//terraform/myfile",
             "git::https://myserver.com/example.git//myfile?ref=master",
         ];
@@ -219,6 +232,72 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_extract_ssh_url_information() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases: Vec<(&str, &str, &str, Option<String>)> = vec![
+            (
+                "git::ssh://git@github.com:myorg/example.git//myfile?ref=v1.0.0",
+                "git@github.com:myorg/example.git",
+                "myfile",
+                Some("v1.0.0".to_string()),
+            ),
+            (
+                "git::ssh://git@github.com:myorg/example.git//terraform/myfile?ref=master",
+                "git@github.com:myorg/example.git",
+                "terraform/myfile",
+                Some("master".to_string()),
+            ),
+            (
+                "git::ssh://git@myserver.com/example.git//terraform/myfile",
+                "git@myserver.com/example.git",
+                "terraform/myfile",
+                None,
+            ),
+        ];
+
+        for (url, expected_repo, expected_path, expected_branch) in test_cases {
+            let repo = remote_task_git.detect_ssh(url).unwrap();
+            assert_eq!(expected_repo, repo.url_without_path);
+            assert_eq!(expected_path, repo.path);
+            assert_eq!(expected_branch, repo.branch);
+        }
+    }
+
+    #[test]
+    fn test_extract_https_url_information() {
+        let remote_task_git = RemoteTaskGitBuilder::new().build();
+
+        let test_cases: Vec<(&str, &str, &str, Option<String>)> = vec![
+            (
+                "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0",
+                "https://github.com/myorg/example.git",
+                "myfile",
+                Some("v1.0.0".to_string()),
+            ),
+            (
+                "git::https://github.com/myorg/example.git//terraform/myfile?ref=master",
+                "https://github.com/myorg/example.git",
+                "terraform/myfile",
+                Some("master".to_string()),
+            ),
+            (
+                "git::https://myserver.com/example.git//terraform/myfile",
+                "https://myserver.com/example.git",
+                "terraform/myfile",
+                None,
+            ),
+        ];
+
+        for (url, expected_repo, expected_path, expected_branch) in test_cases {
+            let repo = remote_task_git.detect_https(url).unwrap();
+            assert_eq!(expected_repo, repo.url_without_path);
+            assert_eq!(expected_path, repo.path);
+            assert_eq!(expected_branch, repo.branch);
+        }
+    }
+
     #[test]
     fn test_compare_ssh_get_cache_key() {
         let remote_task_git = RemoteTaskGitBuilder::new().build();

From 25e073beac68f73a678d186296b3fd450ff0961e Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 1 Feb 2025 16:47:31 +0100
Subject: [PATCH 07/21] fix: code and add e2e

---
 docs/tasks/toml-tasks.md                        | 2 +-
 src/task/task_file_providers/remote_task_git.rs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/tasks/toml-tasks.md b/docs/tasks/toml-tasks.md
index dd7be7f4af..08d0b2fe6c 100644
--- a/docs/tasks/toml-tasks.md
+++ b/docs/tasks/toml-tasks.md
@@ -345,7 +345,7 @@ file = "https://example.com/build.sh"
 
 Please note that the file will be downloaded and executed. Make sure you trust the source.
 
-#### Git
+#### Git <Badge type="warning" text="experimental" />
 
 ::: code-group
 
diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
index 9b5265d240..6d7193915e 100644
--- a/src/task/task_file_providers/remote_task_git.rs
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -156,6 +156,10 @@ impl TaskFileProvider for RemoteTaskGit {
 
         let git_cloned = git::clone(repo_structure.url_without_path.as_str(), destination)?;
 
+        if let Some(branch) = repo_structure.branch {
+            git_cloned.update(Some(branch))?;
+        }
+
         Ok(git_cloned.dir.join(&repo_file_path))
     }
 }

From 53f295da3699271a8fb036a346a15fb57391d958 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 1 Feb 2025 16:55:29 +0100
Subject: [PATCH 08/21] fix: code and add e2e

---
 e2e/tasks/test_task_remote_git_https | 30 ++++++++++++++++++++++++++++
 e2e/tasks/test_task_remote_git_ssh   | 17 +---------------
 2 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100755 e2e/tasks/test_task_remote_git_https

diff --git a/e2e/tasks/test_task_remote_git_https b/e2e/tasks/test_task_remote_git_https
new file mode 100755
index 0000000000..b2f8f36a37
--- /dev/null
+++ b/e2e/tasks/test_task_remote_git_https
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+cargo init --name hello_cargo 
+
+#################################################################################
+# Test remote tasks with no ref
+#################################################################################
+
+cat <<EOF >mise.toml
+[tasks.remote_lint_https_latest]
+file  = "git::https://github.com/jdx/mise.git//xtasks/lint/clippy"
+EOF
+
+assert_contains "mise tasks" "remote_lint_https_latest"
+assert_succeed "mise run remote_lint_https_latest" # Remote task should be downloaded
+
+mise cache clear # Clear cache to force redownload
+
+assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_https_latest" # Remote task should be redownloaded
+
+assert_succeed "mise run remote_lint_https_latest --no-cache" # Remote task should be redownloaded
+
+assert_succeed "mise run remote_lint_https_latest" # Cache should be used
+
+
+#################################################################################
+# Test remote tasks with with ref
+#################################################################################
+
+# TODO: Add test for remote task with ref
diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index ac08bd0404..c7680682d5 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -1,14 +1,6 @@
 #!/usr/bin/env bash
 
-REMOTE_CACHED_TASKS_DIR="$MISE_CACHE_DIR/remote-git-tasks-cache"
-
-count_dirs() {
-  find "$REMOTE_CACHED_TASKS_DIR" -mindepth 1 -maxdepth 1 -type d | wc -l
-}
-
-list_dirs() {
-  find "$REMOTE_CACHED_TASKS_DIR" -mindepth 1 -maxdepth 1 -type d
-}
+cargo init --name hello_cargo 
 
 #################################################################################
 # Test remote tasks with no ref
@@ -21,21 +13,14 @@ EOF
 
 assert_contains "mise tasks" "remote_lint_ssh_latest"
 assert_succeed "mise run remote_lint_ssh_latest" # Remote task should be downloaded
-assert_equals "$(count_dirs)" "1"
 
 mise cache clear # Clear cache to force redownload
 
 assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_latest" # Remote task should be redownloaded
-assert_equals "$(count_dirs)" "1"
 
 assert_succeed "mise run remote_lint_ssh_latest --no-cache" # Remote task should be redownloaded
-assert_equals "$(count_dirs)" "1"
-cache_before=$(list_dirs)
 
 assert_succeed "mise run remote_lint_ssh_latest" # Cache should be used
-assert_equals "$(count_dirs)" "1"
-cache_after=$(list_dirs)
-assert_succeed "diff $cache_before $cache_after"
 
 #################################################################################
 # Test remote tasks with with ref

From 205e13868aee0c39d457f44e0677e81497bacbc3 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 1 Feb 2025 16:56:08 +0100
Subject: [PATCH 09/21] fix: code and add e2e

---
 docs/tasks/toml-tasks.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/tasks/toml-tasks.md b/docs/tasks/toml-tasks.md
index 08d0b2fe6c..dde42848d4 100644
--- a/docs/tasks/toml-tasks.md
+++ b/docs/tasks/toml-tasks.md
@@ -361,7 +361,7 @@ file = "git::https://github.com/myorg/example.git//myfile?ref=v1.0.0"
 
 :::
 
-Url format must follow these patterns `git::<protocol>://<url>//<path>?<query>`
+Url format must follow these patterns `git::<protocol>://<url>//<path>?<ref>`
 
 Required fields:
 
@@ -371,7 +371,7 @@ Required fields:
 
 Optional fields:
 
-- `query`: The git reference (branch, tag, commit).
+- `ref`: The git reference (branch, tag, commit).
 
 #### Cache
 

From 27842919c79a936f55856fef8b0ee3de2f4d3260 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 1 Feb 2025 15:58:39 +0000
Subject: [PATCH 10/21] [autofix.ci] apply automated fixes

---
 e2e/tasks/test_task_remote_git_https | 3 +--
 e2e/tasks/test_task_remote_git_ssh   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/e2e/tasks/test_task_remote_git_https b/e2e/tasks/test_task_remote_git_https
index b2f8f36a37..2d64b1c26e 100755
--- a/e2e/tasks/test_task_remote_git_https
+++ b/e2e/tasks/test_task_remote_git_https
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cargo init --name hello_cargo 
+cargo init --name hello_cargo
 
 #################################################################################
 # Test remote tasks with no ref
@@ -22,7 +22,6 @@ assert_succeed "mise run remote_lint_https_latest --no-cache" # Remote task shou
 
 assert_succeed "mise run remote_lint_https_latest" # Cache should be used
 
-
 #################################################################################
 # Test remote tasks with with ref
 #################################################################################
diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index c7680682d5..2076593af6 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cargo init --name hello_cargo 
+cargo init --name hello_cargo
 
 #################################################################################
 # Test remote tasks with no ref

From 2b10f5ef39183e0bb9355992f8773d073e971279 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 1 Feb 2025 17:04:45 +0100
Subject: [PATCH 11/21] fix: code and add e2e

---
 e2e/tasks/test_task_remote_git_https            | 16 +++++++++++++++-
 e2e/tasks/test_task_remote_git_ssh              | 16 +++++++++++++++-
 src/task/task_file_providers/remote_task_git.rs |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/e2e/tasks/test_task_remote_git_https b/e2e/tasks/test_task_remote_git_https
index 2d64b1c26e..05d2ba840d 100755
--- a/e2e/tasks/test_task_remote_git_https
+++ b/e2e/tasks/test_task_remote_git_https
@@ -26,4 +26,18 @@ assert_succeed "mise run remote_lint_https_latest" # Cache should be used
 # Test remote tasks with with ref
 #################################################################################
 
-# TODO: Add test for remote task with ref
+cat <<EOF >mise.toml
+[tasks.remote_lint_https_ref]
+file  = "git::https://github.com/jdx/mise.git//xtasks/lint/clippy?ref=v2025.1.17"
+EOF
+
+assert_contains "mise tasks" "remote_lint_https_ref"
+assert_succeed "mise run remote_lint_https_ref" # Remote task should be downloaded
+
+mise cache clear # Clear cache to force redownload
+
+assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_https_ref" # Remote task should be redownloaded
+
+assert_succeed "mise run remote_lint_https_ref --no-cache" # Remote task should be redownloaded
+
+assert_succeed "mise run remote_lint_https_ref" # Cache should be used
diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index 2076593af6..fe3c29e640 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -26,4 +26,18 @@ assert_succeed "mise run remote_lint_ssh_latest" # Cache should be used
 # Test remote tasks with with ref
 #################################################################################
 
-# TODO: Add test for remote task with ref
+cat <<EOF >mise.toml
+[tasks.remote_lint_ssh_ref]
+file  = "git::ssh://git@github.com:jdx/mise.git//xtasks/lint/clippy?ref=v2025.1.17"
+EOF
+
+assert_contains "mise tasks" "remote_lint_ssh_ref"
+assert_succeed "mise run remote_lint_ssh_ref" # Remote task should be downloaded
+
+mise cache clear # Clear cache to force redownload
+
+assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_ref" # Remote task should be redownloaded
+
+assert_succeed "mise run remote_lint_ssh_ref --no-cache" # Remote task should be redownloaded
+
+assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
index 6d7193915e..e5bd3b9cb1 100644
--- a/src/task/task_file_providers/remote_task_git.rs
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -149,7 +149,7 @@ impl TaskFileProvider for RemoteTaskGit {
                 trace!("Cache mode disabled");
 
                 if full_path.exists() {
-                    crate::file::remove_dir(full_path)?;
+                    crate::file::remove_all(&destination)?;
                 }
             }
         }

From d94aa37aa0f5074813ed976f85c610aecf3a6e30 Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Fri, 7 Feb 2025 16:49:18 +0100
Subject: [PATCH 12/21] fix: code

---
 mise.lock                                     |  4 ++
 src/aqua/aqua_registry.rs                     |  4 +-
 src/backend/spm.rs                            |  7 +++-
 src/git.rs                                    | 40 ++++++++++++++++---
 src/plugins/asdf_plugin.rs                    |  4 +-
 src/plugins/core/python.rs                    |  8 +++-
 src/plugins/core/ruby.rs                      | 14 +++++--
 src/plugins/vfox_plugin.rs                    |  7 ++--
 .../task_file_providers/remote_task_git.rs    | 19 ++++++---
 9 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/mise.lock b/mise.lock
index 1ab8ea7d17..412f50c0bb 100644
--- a/mise.lock
+++ b/mise.lock
@@ -5,6 +5,7 @@ backend = "aqua:rhysd/actionlint"
 [tools.actionlint.checksums]
 "actionlint_1.7.7_darwin_arm64.tar.gz" = "sha256:2693315b9093aeacb4ebd91a993fea54fc215057bf0da2659056b4bc033873db"
 "actionlint_1.7.7_linux_amd64.tar.gz" = "sha256:023070a287cd8cccd71515fedc843f1985bf96c436b7effaecce67290e7e0757"
+"actionlint_1.7.7_linux_arm64.tar.gz" = "sha256:401942f9c24ed71e4fe71b76c7d638f66d8633575c4016efd2977ce7c28317d0"
 
 [tools.bun]
 version = "1.2.2"
@@ -12,6 +13,7 @@ backend = "core:bun"
 
 [tools.bun.checksums]
 "bun-darwin-aarch64.zip" = "sha256:c4d58e06c5c33885b526f4d91a38ca9ebdb9fc3fb4cd547f7d3302055c98e41c"
+"bun-linux-aarch64.zip" = "sha256:d1dbaa3e9af24549fad92bdbe4fb21fa53302cd048a8f004e85a240984c93d4d"
 "bun-linux-x64-baseline.zip" = "sha256:cad7756a6ee16f3432a328f8023fc5cd431106822eacfa6d6d3afbad6fdc24db"
 
 [tools.cargo-binstall]
@@ -20,6 +22,7 @@ backend = "aqua:cargo-bins/cargo-binstall"
 
 [tools.cargo-binstall.checksums]
 "cargo-binstall-aarch64-apple-darwin.zip" = "sha256:97ce4a2f18181f052dda266b042d8bb220e48ffe40ca75e796ae4c5e418b9e01"
+"cargo-binstall-aarch64-unknown-linux-musl.tgz" = "sha256:b8c32b1b007482f42f6c4b5f8cfeb168f9674ec6448bfa29ae0c4ba01b7a370b"
 "cargo-binstall-x86_64-unknown-linux-musl.tgz" = "sha256:74d7c647c7e60bb8464fa551702fdd38a7241f5cedb2c4edc3b11639cd1dae47"
 
 [tools."cargo:cargo-edit"]
@@ -115,6 +118,7 @@ version = "2.6.0"
 backend = "ubi:slsa-framework/slsa-verifier"
 
 [tools.slsa-verifier.checksums]
+slsa-verifier-linux-aarch64 = "sha256:92b28eb2db998f9a6a048336928b29a38cb100076cd587e443ca0a2543d7c93d"
 slsa-verifier-linux-x86_64 = "sha256:1c9c0d6a272063f3def6d233fa3372adbaff1f5a3480611a07c744e73246b62d"
 slsa-verifier-macos-aarch64 = "sha256:8740e66832fd48bbaa479acd5310986b876ff545460add0cb4a087aec056189c"
 "slsa-verifier.exe-windows-x86_64" = "sha256:37ca29ad748e8ea7be76d3ae766e8fa505362240431f6ea7f0648c727e2f2507"
diff --git a/src/aqua/aqua_registry.rs b/src/aqua/aqua_registry.rs
index 91f2644062..5f1a209f68 100644
--- a/src/aqua/aqua_registry.rs
+++ b/src/aqua/aqua_registry.rs
@@ -3,7 +3,7 @@ use crate::backend::aqua;
 use crate::backend::aqua::{arch, os};
 use crate::config::SETTINGS;
 use crate::duration::{DAILY, WEEKLY};
-use crate::git::Git;
+use crate::git::{CloneOptions, Git};
 use crate::{dirs, file, hashmap, http};
 use expr::{Context, Parser, Program, Value};
 use eyre::{eyre, ContextCompat, Result};
@@ -175,7 +175,7 @@ impl AquaRegistry {
             fetch_latest_repo(&repo)?;
         } else if let Some(aqua_registry_url) = &SETTINGS.aqua.registry_url {
             info!("cloning aqua registry to {path:?}");
-            repo.clone(aqua_registry_url, None)?;
+            repo.clone(aqua_registry_url, CloneOptions::default())?;
             repo_exists = true;
         }
         Ok(Self { path, repo_exists })
diff --git a/src/backend/spm.rs b/src/backend/spm.rs
index f8408b76f3..c65de6d2ac 100644
--- a/src/backend/spm.rs
+++ b/src/backend/spm.rs
@@ -3,7 +3,7 @@ use crate::backend::Backend;
 use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
 use crate::config::Settings;
-use crate::git::Git;
+use crate::git::{CloneOptions, Git};
 use crate::install_context::InstallContext;
 use crate::toolset::ToolVersion;
 use crate::{dirs, file, github};
@@ -95,7 +95,10 @@ impl SPMBackend {
                 package_repo.url.as_str(),
                 repo.dir.display(),
             );
-            repo.clone(package_repo.url.as_str(), Some(&ctx.pr))?;
+            repo.clone(
+                package_repo.url.as_str(),
+                CloneOptions::default().pr(&ctx.pr),
+            )?;
         }
         debug!("Checking out revision: {revision}");
         repo.update_tag(revision.to_string())?;
diff --git a/src/git.rs b/src/git.rs
index c6358da33c..907b14b783 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -116,7 +116,7 @@ impl Git {
         Ok((prev_rev, post_rev))
     }
 
-    pub fn clone(&self, url: &str, pr: Option<&Box<dyn SingleReport>>) -> Result<()> {
+    pub fn clone(&self, url: &str, options: CloneOptions) -> Result<()> {
         debug!("cloning {} to {}", url, self.dir.display());
         if let Some(parent) = self.dir.parent() {
             file::mkdirp(parent)?;
@@ -139,18 +139,30 @@ impl Git {
                 err
             ),
         }
-        if let Some(pr) = pr {
+        if let Some(pr) = &options.pr {
             // in order to prevent hiding potential password prompt, just disable the progress bar
             pr.abandon();
         }
-        CmdLineRunner::new("git")
+
+        let mut cmd = CmdLineRunner::new("git")
             .arg("clone")
             .arg("-q")
             .arg("--depth")
             .arg("1")
             .arg(url)
-            .arg(&self.dir)
-            .execute()?;
+            .arg(&self.dir);
+
+        if let Some(branch) = &options.branch {
+            cmd = cmd.args([
+                "-b",
+                branch,
+                "--single-branch",
+                "-c",
+                "advice.detachedHead=false",
+            ]);
+        }
+
+        cmd.execute()?;
         Ok(())
     }
 
@@ -265,3 +277,21 @@ impl Debug for Git {
         f.debug_struct("Git").field("dir", &self.dir).finish()
     }
 }
+
+#[derive(Default)]
+pub struct CloneOptions<'a> {
+    pr: Option<&'a Box<dyn SingleReport>>,
+    branch: Option<String>,
+}
+
+impl<'a> CloneOptions<'a> {
+    pub fn pr(mut self, pr: &'a Box<dyn SingleReport>) -> Self {
+        self.pr = Some(pr);
+        self
+    }
+
+    pub fn branch(mut self, branch: &str) -> Self {
+        self.branch = Some(branch.to_string());
+        self
+    }
+}
diff --git a/src/plugins/asdf_plugin.rs b/src/plugins/asdf_plugin.rs
index 56aa6ec33b..3c2c6bac44 100644
--- a/src/plugins/asdf_plugin.rs
+++ b/src/plugins/asdf_plugin.rs
@@ -1,7 +1,7 @@
 use crate::config::{Config, Settings, SETTINGS};
 use crate::errors::Error::PluginNotInstalled;
 use crate::file::{display_path, remove_all};
-use crate::git::Git;
+use crate::git::{CloneOptions, Git};
 use crate::plugins::{Plugin, PluginType, Script, ScriptManager};
 use crate::result::Result;
 use crate::timeout::run_with_timeout;
@@ -333,7 +333,7 @@ Plugins could support local directories in the future but for now a symlink is r
         }
         let git = Git::new(&self.plugin_path);
         pr.set_message(format!("clone {repo_url}"));
-        git.clone(&repo_url, Some(pr))?;
+        git.clone(&repo_url, CloneOptions::default().pr(pr))?;
         if let Some(ref_) = &repo_ref {
             pr.set_message(format!("check out {ref_}"));
             git.update(Some(ref_.to_string()))?;
diff --git a/src/plugins/core/python.rs b/src/plugins/core/python.rs
index 1ac097d19e..3bbaaa16fc 100644
--- a/src/plugins/core/python.rs
+++ b/src/plugins/core/python.rs
@@ -5,7 +5,7 @@ use crate::cli::args::BackendArg;
 use crate::cmd::CmdLineRunner;
 use crate::config::{Config, SETTINGS};
 use crate::file::{display_path, TarOptions};
-use crate::git::Git;
+use crate::git::{CloneOptions, Git};
 use crate::http::{HTTP, HTTP_FETCH};
 use crate::install_context::InstallContext;
 use crate::toolset::{ToolRequest, ToolVersion, Toolset};
@@ -66,7 +66,11 @@ impl PythonPlugin {
         file::create_dir_all(self.python_build_path().parent().unwrap())?;
         let git = Git::new(self.python_build_path());
         let pr = ctx.map(|ctx| &ctx.pr);
-        git.clone(&SETTINGS.python.pyenv_repo, pr)?;
+        let mut clone_options = CloneOptions::default();
+        if let Some(pr) = pr {
+            clone_options = clone_options.pr(pr);
+        }
+        git.clone(&SETTINGS.python.pyenv_repo, clone_options)?;
         Ok(())
     }
     fn update_python_build(&self) -> eyre::Result<()> {
diff --git a/src/plugins/core/ruby.rs b/src/plugins/core/ruby.rs
index 5764b673d9..830db766f4 100644
--- a/src/plugins/core/ruby.rs
+++ b/src/plugins/core/ruby.rs
@@ -8,7 +8,7 @@ use crate::cmd::CmdLineRunner;
 use crate::config::{Config, Settings, SETTINGS};
 use crate::duration::DAILY;
 use crate::env::PATH_KEY;
-use crate::git::Git;
+use crate::git::{CloneOptions, Git};
 use crate::github::GithubRelease;
 use crate::http::{HTTP, HTTP_FETCH};
 use crate::install_context::InstallContext;
@@ -81,7 +81,11 @@ impl RubyPlugin {
         file::remove_all(&tmp)?;
         file::create_dir_all(tmp.parent().unwrap())?;
         let git = Git::new(tmp.clone());
-        git.clone(&SETTINGS.ruby.ruby_build_repo, pr)?;
+        let mut clone_options = CloneOptions::default();
+        if let Some(pr) = pr {
+            clone_options = clone_options.pr(pr);
+        }
+        git.clone(&SETTINGS.ruby.ruby_build_repo, clone_options)?;
 
         cmd!("sh", "install.sh")
             .env("PREFIX", self.ruby_build_path())
@@ -123,7 +127,11 @@ impl RubyPlugin {
         file::remove_all(&tmp)?;
         file::create_dir_all(tmp.parent().unwrap())?;
         let git = Git::new(tmp.clone());
-        git.clone(&settings.ruby.ruby_install_repo, pr)?;
+        let mut clone_options = CloneOptions::default();
+        if let Some(pr) = pr {
+            clone_options = clone_options.pr(pr);
+        }
+        git.clone(&settings.ruby.ruby_install_repo, clone_options)?;
 
         cmd!("make", "install")
             .env("PREFIX", self.ruby_install_path())
diff --git a/src/plugins/vfox_plugin.rs b/src/plugins/vfox_plugin.rs
index 3422b66c12..ad7a34b13e 100644
--- a/src/plugins/vfox_plugin.rs
+++ b/src/plugins/vfox_plugin.rs
@@ -1,5 +1,5 @@
 use crate::file::{display_path, remove_all};
-use crate::git::Git;
+use crate::git::{CloneOptions, Git};
 use crate::plugins::{Plugin, PluginType};
 use crate::result::Result;
 use crate::tokio::RUNTIME;
@@ -133,7 +133,8 @@ impl Plugin for VfoxPlugin {
             let url = self.get_repo_url()?;
             trace!("Cloning vfox plugin: {url}");
             let pr = mpr.add(&format!("clone vfox plugin {}", url));
-            self.repo().clone(url.as_str(), Some(&pr))?;
+            self.repo()
+                .clone(url.as_str(), CloneOptions::default().pr(&pr))?;
         }
         Ok(())
     }
@@ -208,7 +209,7 @@ Plugins could support local directories in the future but for now a symlink is r
         }
         let git = Git::new(&self.plugin_path);
         pr.set_message(format!("clone {repo_url}"));
-        git.clone(&repo_url, Some(pr))?;
+        git.clone(&repo_url, CloneOptions::default().pr(pr))?;
         if let Some(ref_) = &repo_ref {
             pr.set_message(format!("git update {ref_}"));
             git.update(Some(ref_.to_string()))?;
diff --git a/src/task/task_file_providers/remote_task_git.rs b/src/task/task_file_providers/remote_task_git.rs
index e5bd3b9cb1..1e30799ca7 100644
--- a/src/task/task_file_providers/remote_task_git.rs
+++ b/src/task/task_file_providers/remote_task_git.rs
@@ -1,9 +1,12 @@
 use std::path::PathBuf;
 
 use regex::Regex;
-use xx::git;
 
-use crate::{dirs, env, hash};
+use crate::{
+    dirs, env,
+    git::{self, CloneOptions},
+    hash,
+};
 
 use super::TaskFileProvider;
 
@@ -154,13 +157,17 @@ impl TaskFileProvider for RemoteTaskGit {
             }
         }
 
-        let git_cloned = git::clone(repo_structure.url_without_path.as_str(), destination)?;
+        let git_repo = git::Git::new(destination);
 
-        if let Some(branch) = repo_structure.branch {
-            git_cloned.update(Some(branch))?;
+        let mut clone_options = CloneOptions::default();
+
+        if let Some(branch) = &repo_structure.branch {
+            clone_options = clone_options.branch(branch);
         }
 
-        Ok(git_cloned.dir.join(&repo_file_path))
+        git_repo.clone(repo_structure.url_without_path.as_str(), clone_options)?;
+
+        Ok(full_path)
     }
 }
 

From 1d83cfa7104ad00dc9ec2ccfdcd472367c32251a Mon Sep 17 00:00:00 2001
From: acesyde <acesyde@gmail.com>
Date: Fri, 7 Feb 2025 17:03:02 +0100
Subject: [PATCH 13/21] fix: test pipeline

---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0248e22c67..d8a34b0658 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -199,6 +199,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.RTX_SSH_KEY }}
       - name: Install build and test dependencies
         run: |
           sudo apt-get install \

From 53c2a86db0a19d47919e648903a4fe9ce8bc12bc Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Fri, 7 Feb 2025 19:22:27 +0100
Subject: [PATCH 14/21] fix: code

---
 .github/workflows/test.yml         |  3 ---
 e2e/tasks/test_task_remote_git_ssh | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d8a34b0658..0248e22c67 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -199,9 +199,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.RTX_SSH_KEY }}
       - name: Install build and test dependencies
         run: |
           sudo apt-get install \
diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index fe3c29e640..26c2a2fe79 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -1,5 +1,19 @@
 #!/usr/bin/env bash
 
+#################################################################################
+# Prerequisites
+#################################################################################
+
+# Only create the ssh key if the CI env var is set
+if [ -n "$CI" ]; then
+    TEMP_SSH_KEY="temp_ssh_key"
+    ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N ""
+    eval "$(ssh-agent -s)"
+    ssh-add "$TEMP_SSH_KEY"
+else
+    echo "Skipping test as CI env var is not set"
+fi
+
 cargo init --name hello_cargo
 
 #################################################################################
@@ -40,4 +54,4 @@ assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_ref" # R
 
 assert_succeed "mise run remote_lint_ssh_ref --no-cache" # Remote task should be redownloaded
 
-assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
+assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
\ No newline at end of file

From eca61fb724f6f54fe46ecd10286782c3d97985c3 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Fri, 7 Feb 2025 18:24:46 +0000
Subject: [PATCH 15/21] [autofix.ci] apply automated fixes

---
 e2e/tasks/test_task_remote_git_ssh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index 26c2a2fe79..ab5544d6b8 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -6,12 +6,12 @@
 
 # Only create the ssh key if the CI env var is set
 if [ -n "$CI" ]; then
-    TEMP_SSH_KEY="temp_ssh_key"
-    ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N ""
-    eval "$(ssh-agent -s)"
-    ssh-add "$TEMP_SSH_KEY"
+  TEMP_SSH_KEY="temp_ssh_key"
+  ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N ""
+  eval "$(ssh-agent -s)"
+  ssh-add "$TEMP_SSH_KEY"
 else
-    echo "Skipping test as CI env var is not set"
+  echo "Skipping test as CI env var is not set"
 fi
 
 cargo init --name hello_cargo
@@ -54,4 +54,4 @@ assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_ref" # R
 
 assert_succeed "mise run remote_lint_ssh_ref --no-cache" # Remote task should be redownloaded
 
-assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
\ No newline at end of file
+assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used

From f999329e7fe0c3dc183c76772be20ea3b020e6e9 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Fri, 7 Feb 2025 19:35:39 +0100
Subject: [PATCH 16/21] fix: code

---
 e2e/tasks/test_task_remote_git_ssh | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index ab5544d6b8..6749739693 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -4,15 +4,10 @@
 # Prerequisites
 #################################################################################
 
-# Only create the ssh key if the CI env var is set
-if [ -n "$CI" ]; then
-  TEMP_SSH_KEY="temp_ssh_key"
-  ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N ""
-  eval "$(ssh-agent -s)"
-  ssh-add "$TEMP_SSH_KEY"
-else
-  echo "Skipping test as CI env var is not set"
-fi
+TEMP_SSH_KEY="temp_ssh_key"
+ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N ""
+eval "$(ssh-agent -s)"
+ssh-add "$TEMP_SSH_KEY"
 
 cargo init --name hello_cargo
 
@@ -55,3 +50,10 @@ assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_ref" # R
 assert_succeed "mise run remote_lint_ssh_ref --no-cache" # Remote task should be redownloaded
 
 assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
+
+#################################################################################
+# Cleanup
+#################################################################################
+
+ssh-add -d "$TEMP_SSH_KEY"
+rm -f "$TEMP_SSH_KEY"

From f0e2f235754022fea203a4d07a59208c11b05781 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Fri, 7 Feb 2025 20:59:44 +0100
Subject: [PATCH 17/21] fix: code

---
 e2e/tasks/test_task_remote_git_ssh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index 6749739693..1d922f7a2a 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -4,11 +4,20 @@
 # Prerequisites
 #################################################################################
 
+# Variables
 TEMP_SSH_KEY="temp_ssh_key"
-ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N ""
+
+# 1. Create a temporary SSH key
+ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N "" -q
+
+# 2. Add the key to the SSH agent
 eval "$(ssh-agent -s)"
 ssh-add "$TEMP_SSH_KEY"
 
+# 3. Add GitHub's SSH key fingerprint to known_hosts
+mkdir -p ~/.ssh
+ssh-keyscan -t rsa github.com >>~/.ssh/known_hosts
+
 cargo init --name hello_cargo
 
 #################################################################################
@@ -56,4 +65,5 @@ assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
 #################################################################################
 
 ssh-add -d "$TEMP_SSH_KEY"
-rm -f "$TEMP_SSH_KEY"
+ssh-agent -k
+rm -f "$TEMP_SSH_KEY" "$TEMP_SSH_KEY.pub"

From 5af907a002aad3ebbf51cce590e28e60a2bf792d Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 8 Feb 2025 10:01:44 +0100
Subject: [PATCH 18/21] fix: code

---
 e2e/tasks/test_task_remote_git_ssh | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index 1d922f7a2a..b347ef8b27 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -1,22 +1,9 @@
 #!/usr/bin/env bash
 
-#################################################################################
-# Prerequisites
-#################################################################################
-
-# Variables
-TEMP_SSH_KEY="temp_ssh_key"
-
-# 1. Create a temporary SSH key
-ssh-keygen -t ed25519 -f "$TEMP_SSH_KEY" -N "" -q
-
-# 2. Add the key to the SSH agent
-eval "$(ssh-agent -s)"
-ssh-add "$TEMP_SSH_KEY"
-
-# 3. Add GitHub's SSH key fingerprint to known_hosts
-mkdir -p ~/.ssh
-ssh-keyscan -t rsa github.com >>~/.ssh/known_hosts
+if [ -n "${CI-}" ]; then
+  echo "This test is not supported in CI, because it requires a SSH key to be added to the GitHub account"
+  exit 1
+fi
 
 cargo init --name hello_cargo
 
@@ -59,11 +46,3 @@ assert_succeed "MISE_TASK_REMOTE_NO_CACHE=true mise run remote_lint_ssh_ref" # R
 assert_succeed "mise run remote_lint_ssh_ref --no-cache" # Remote task should be redownloaded
 
 assert_succeed "mise run remote_lint_ssh_ref" # Cache should be used
-
-#################################################################################
-# Cleanup
-#################################################################################
-
-ssh-add -d "$TEMP_SSH_KEY"
-ssh-agent -k
-rm -f "$TEMP_SSH_KEY" "$TEMP_SSH_KEY.pub"

From a867a64455b68a6b50bbdb600833a7c47c83b0c2 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 8 Feb 2025 10:13:16 +0100
Subject: [PATCH 19/21] fix: ci

---
 e2e/run_test                       | 1 +
 e2e/tasks/test_task_remote_git_ssh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/e2e/run_test b/e2e/run_test
index 00299b6f7a..4503078f45 100755
--- a/e2e/run_test
+++ b/e2e/run_test
@@ -85,6 +85,7 @@ within_isolated_env() {
     TEST_ROOT="$SCRIPT_DIR" \
     TEST_SCRIPT="$TEST_SCRIPT" \
     TMPDIR="$TEST_TMPDIR" \
+    CI="${CI:-}" \
     "$@" || return $?
 }
 
diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index b347ef8b27..53d5d43b99 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -n "${CI-}" ]; then
+if [ -n "$CI" ]; then
   echo "This test is not supported in CI, because it requires a SSH key to be added to the GitHub account"
   exit 1
 fi

From f97d7c46ee12185ba34e2cbb2137f81f825deaa0 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 8 Feb 2025 10:21:04 +0100
Subject: [PATCH 20/21] fix: ci

---
 e2e/run_test                       | 2 +-
 e2e/tasks/test_task_remote_git_ssh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/e2e/run_test b/e2e/run_test
index 4503078f45..970982bfcb 100755
--- a/e2e/run_test
+++ b/e2e/run_test
@@ -85,7 +85,7 @@ within_isolated_env() {
     TEST_ROOT="$SCRIPT_DIR" \
     TEST_SCRIPT="$TEST_SCRIPT" \
     TMPDIR="$TEST_TMPDIR" \
-    CI="${CI:-}" \
+    EXCLUDE_FROM_CI="${CI:-}" \
     "$@" || return $?
 }
 
diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index 53d5d43b99..9a9fe865b3 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -n "$CI" ]; then
+if [ -n "$EXCLUDE_FROM_CI" ]; then
   echo "This test is not supported in CI, because it requires a SSH key to be added to the GitHub account"
   exit 1
 fi

From b4a264bdeac0084bef902c22aca0cb4ef8279cc5 Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Mercier <acesyde@gmail.com>
Date: Sat, 8 Feb 2025 10:31:51 +0100
Subject: [PATCH 21/21] fix: ci

---
 e2e/tasks/test_task_remote_git_ssh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/tasks/test_task_remote_git_ssh b/e2e/tasks/test_task_remote_git_ssh
index 9a9fe865b3..f7367e61aa 100755
--- a/e2e/tasks/test_task_remote_git_ssh
+++ b/e2e/tasks/test_task_remote_git_ssh
@@ -2,7 +2,7 @@
 
 if [ -n "$EXCLUDE_FROM_CI" ]; then
   echo "This test is not supported in CI, because it requires a SSH key to be added to the GitHub account"
-  exit 1
+  exit 0
 fi
 
 cargo init --name hello_cargo