feat(gitlab): add gitlab ci support

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+  "recommendations": [
+    "esbenp.prettier-vscode",
+    "foxundermoon.shell-format",
+    "rust-lang.rust-analyzer",
+    "GitHub.vscode-github-actions",
+    "GitLab.gitlab-workflow"
+  ]
+}

.vscode/settings.json

@@ -1,5 +1,18 @@
 {
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "rust-analyzer.checkOnSave": true,
-  "rust-analyzer.check.command": "clippy"
+  "rust-analyzer.check.command": "clippy",
+  "[dotenv][ignore][properties][shellscript]": {
+    "editor.defaultFormatter": "foxundermoon.shell-format"
+  },
+  "[html][javascript][json]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[rust]": {
+    "editor.defaultFormatter": "rust-lang.rust-analyzer"
+  },
+  "files.watcherExclude": {
+    "**/target/**": true
+  }
 }

cspell.json

@@ -0,0 +1,10 @@
+{
+    // Version of the setting file.  Always 0.2
+    "version": "0.2",
+    // language - current active spelling language
+    "language": "en",
+    // words - list of words to be always considered correct
+    "words": [
+        "codspeed"
+    ]
+}

src/run/check_system.rs

@@ -38,7 +38,7 @@ pub struct SystemInfo {
 impl SystemInfo {
     pub fn test() -> Self {
         SystemInfo {
-            os: "Ubuntu".to_string(),
+            os: "ubuntu".to_string(),
             os_version: "20.04".to_string(),
             arch: "x86_64".to_string(),
             host: "host".to_string(),
@@ -54,7 +54,7 @@ impl SystemInfo {
 
 impl SystemInfo {
     pub fn new() -> Result<Self> {
-        let os = System::name().ok_or(anyhow!("Failed to get OS name"))?;
+        let os = System::distribution_id();
         let os_version = System::os_version().ok_or(anyhow!("Failed to get OS version"))?;
         let arch = System::cpu_arch().ok_or(anyhow!("Failed to get CPU architecture"))?;
         let user = get_user()?;
@@ -98,12 +98,12 @@ impl SystemInfo {
 lazy_static! {
     static ref SUPPORTED_SYSTEMS: HashSet<(&'static str, &'static str, &'static str)> = {
         HashSet::from([
-            ("Ubuntu", "20.04", "x86_64"),
-            ("Ubuntu", "22.04", "x86_64"),
-            ("Ubuntu", "24.04", "x86_64"),
-            ("Ubuntu", "22.04", "aarch64"),
-            ("Debian", "11", "x86_64"),
-            ("Debian", "12", "x86_64"),
+            ("ubuntu", "20.04", "x86_64"),
+            ("ubuntu", "22.04", "x86_64"),
+            ("ubuntu", "24.04", "x86_64"),
+            ("ubuntu", "22.04", "aarch64"),
+            ("debian", "11", "x86_64"),
+            ("debian", "12", "x86_64"),
         ])
     };
 }

src/run/ci_provider/buildkite/logger.rs

@@ -39,10 +39,10 @@ impl Log for BuildkiteLogger {
         if let Some(group_event) = get_group_event(record) {
             match group_event {
                 GroupEvent::Start(name) => {
-                    println!("--- {}", name);
+                    println!("--- {name}");
                 }
                 GroupEvent::StartOpened(name) => {
-                    println!("+++ {}", name);
+                    println!("+++ {name}");
                 }
                 GroupEvent::End => {}
             }
@@ -55,19 +55,19 @@ impl Log for BuildkiteLogger {
         // there is no support for log levels in Buildkite, so we print the level in the message
         match level {
             Level::Error => {
-                println!("[ERROR] {}", message);
+                println!("[ERROR] {message}");
             }
             Level::Warn => {
-                println!("[WARN] {}", message);
+                println!("[WARN] {message}");
             }
             Level::Info => {
-                println!("{}", message);
+                println!("{message}");
             }
             Level::Debug => {
-                println!("[DEBUG] {}", message);
+                println!("[DEBUG] {message}");
             }
             Level::Trace => {
-                println!("[TRACE] {}", message);
+                println!("[TRACE] {message}");
             }
         }
     }

src/run/ci_provider/buildkite/provider.rs

@@ -7,7 +7,7 @@ use simplelog::SharedLogger;
 use crate::prelude::*;
 use crate::run::{
     ci_provider::{
-        interfaces::{ProviderMetadata, RunEvent},
+        interfaces::{CIProviderMetadata, RepositoryProvider, RunEvent},
         provider::{CIProvider, CIProviderDetector},
     },
     config::Config,
@@ -18,13 +18,13 @@ use super::logger::BuildkiteLogger;
 
 #[derive(Debug)]
 pub struct BuildkiteProvider {
-    pub owner: String,
-    pub repository: String,
-    pub ref_: String,
-    pub head_ref: Option<String>,
-    pub base_ref: Option<String>,
-    pub event: RunEvent,
-    pub repository_root_path: String,
+    owner: String,
+    repository: String,
+    ref_: String,
+    head_ref: Option<String>,
+    base_ref: Option<String>,
+    event: RunEvent,
+    repository_root_path: String,
 }
 
 lazy_static! {
@@ -133,6 +133,10 @@ impl CIProviderDetector for BuildkiteProvider {
 }
 
 impl CIProvider for BuildkiteProvider {
+    fn get_repository_provider(&self) -> RepositoryProvider {
+        RepositoryProvider::GitHub
+    }
+
     fn get_logger(&self) -> Box<dyn SharedLogger> {
         Box::new(BuildkiteLogger::new())
     }
@@ -145,8 +149,8 @@ impl CIProvider for BuildkiteProvider {
         "buildkite"
     }
 
-    fn get_provider_metadata(&self) -> Result<ProviderMetadata> {
-        Ok(ProviderMetadata {
+    fn get_ci_provider_metadata(&self) -> Result<CIProviderMetadata> {
+        Ok(CIProviderMetadata {
             base_ref: self.base_ref.clone(),
             head_ref: self.head_ref.clone(),
             event: self.event.clone(),
@@ -155,6 +159,8 @@ impl CIProvider for BuildkiteProvider {
             ref_: self.ref_.clone(),
             repository_root_path: self.repository_root_path.clone(),
             gh_data: None,
+            gl_data: None,
+            sender: None,
         })
     }
 }
@@ -300,7 +306,7 @@ mod tests {
                     ..Config::test()
                 };
                 let provider = BuildkiteProvider::try_from(&config).unwrap();
-                let provider_metadata = provider.get_provider_metadata().unwrap();
+                let provider_metadata = provider.get_ci_provider_metadata().unwrap();
 
                 assert_json_snapshot!(provider_metadata, {
                     ".runner.version" => insta::dynamic_redaction(|value,_path| {

src/run/ci_provider/buildkite/snapshots/codspeed__run__ci_provider__buildkite__provider__tests__pull_request_provider_metadata.snap

@@ -9,6 +9,8 @@ expression: provider_metadata
   "owner": "my-org",
   "repository": "adrien-python-test",
   "event": "pull_request",
+  "sender": null,
   "ghData": null,
+  "glData": null,
   "repositoryRootPath": "/buildkite/builds/7b10eca7600b-1/my-org/buildkite-test/"
 }

src/run/ci_provider/github_actions/provider.rs

@@ -7,7 +7,7 @@ use std::{env, fs};
 use crate::prelude::*;
 use crate::run::{
     ci_provider::{
-        interfaces::{GhData, ProviderMetadata, RunEvent, Sender},
+        interfaces::{CIProviderMetadata, GhData, RepositoryProvider, RunEvent, Sender},
         provider::{CIProvider, CIProviderDetector},
     },
     config::Config,
@@ -23,6 +23,7 @@ pub struct GitHubActionsProvider {
     pub ref_: String,
     pub head_ref: Option<String>,
     pub base_ref: Option<String>,
+    pub sender: Option<Sender>,
     pub gh_data: GhData,
     pub event: RunEvent,
     pub repository_root_path: String,
@@ -95,16 +96,12 @@ impl TryFrom<&Config> for GitHubActionsProvider {
             event,
             gh_data: GhData {
                 job: get_env_variable("GITHUB_JOB")?,
-                run_id: get_env_variable("GITHUB_RUN_ID")?
-                    .parse()
-                    .context("Failed to parse GITHUB_RUN_ID into an integer")?,
-                sender: Some(Sender {
-                    login: get_env_variable("GITHUB_ACTOR")?,
-                    id: get_env_variable("GITHUB_ACTOR_ID")?
-                        .parse()
-                        .context("Failed to parse GITHUB_ACTOR_ID into an integer")?,
-                }),
+                run_id: get_env_variable("GITHUB_RUN_ID")?,
             },
+            sender: Some(Sender {
+                login: get_env_variable("GITHUB_ACTOR")?,
+                id: get_env_variable("GITHUB_ACTOR_ID")?,
+            }),
             base_ref: get_env_variable("GITHUB_BASE_REF").ok(),
             repository_root_path,
         })
@@ -119,6 +116,10 @@ impl CIProviderDetector for GitHubActionsProvider {
 }
 
 impl CIProvider for GitHubActionsProvider {
+    fn get_repository_provider(&self) -> RepositoryProvider {
+        RepositoryProvider::GitHub
+    }
+
     fn get_logger(&self) -> Box<dyn SharedLogger> {
         Box::new(GithubActionLogger)
     }
@@ -131,12 +132,14 @@ impl CIProvider for GitHubActionsProvider {
         "github-actions"
     }
 
-    fn get_provider_metadata(&self) -> Result<ProviderMetadata> {
-        Ok(ProviderMetadata {
+    fn get_ci_provider_metadata(&self) -> Result<CIProviderMetadata> {
+        Ok(CIProviderMetadata {
             base_ref: self.base_ref.clone(),
             head_ref: self.head_ref.clone(),
             event: self.event.clone(),
             gh_data: Some(self.gh_data.clone()),
+            gl_data: None,
+            sender: self.sender.clone(),
             owner: self.owner.clone(),
             repository: self.repository.clone(),
             ref_: self.ref_.clone(),
@@ -196,19 +199,14 @@ mod tests {
                 assert_eq!(github_actions_provider.head_ref, None);
                 assert_eq!(github_actions_provider.event, RunEvent::Push);
                 assert_eq!(github_actions_provider.gh_data.job, "job");
-                assert_eq!(github_actions_provider.gh_data.run_id, 1234567890);
+                assert_eq!(github_actions_provider.gh_data.run_id, "1234567890");
                 assert_eq!(
-                    github_actions_provider
-                        .gh_data
-                        .sender
-                        .as_ref()
-                        .unwrap()
-                        .login,
+                    github_actions_provider.sender.as_ref().unwrap().login,
                     "actor"
                 );
                 assert_eq!(
-                    github_actions_provider.gh_data.sender.as_ref().unwrap().id,
-                    1234567890
+                    github_actions_provider.sender.as_ref().unwrap().id,
+                    "1234567890"
                 );
             },
         )
@@ -246,7 +244,7 @@ mod tests {
                     ..Config::test()
                 };
                 let github_actions_provider = GitHubActionsProvider::try_from(&config).unwrap();
-                let provider_metadata = github_actions_provider.get_provider_metadata().unwrap();
+                let provider_metadata = github_actions_provider.get_ci_provider_metadata().unwrap();
 
                 assert_json_snapshot!(provider_metadata, {
                     ".runner.version" => insta::dynamic_redaction(|value,_path| {
@@ -290,7 +288,7 @@ mod tests {
                     ..Config::test()
                 };
                 let github_actions_provider = GitHubActionsProvider::try_from(&config).unwrap();
-                let provider_metadata = github_actions_provider.get_provider_metadata().unwrap();
+                let provider_metadata = github_actions_provider.get_ci_provider_metadata().unwrap();
 
                 assert_eq!(provider_metadata.owner, "my-org");
                 assert_eq!(provider_metadata.repository, "adrien-python-test");

src/run/ci_provider/github_actions/snapshots/codspeed__run__ci_provider__github_actions__provider__tests__fork_pull_request_provider_metadata.snap

@@ -9,13 +9,14 @@ expression: provider_metadata
   "owner": "my-org",
   "repository": "adrien-python-test",
   "event": "pull_request",
+  "sender": {
+    "id": "19605940",
+    "login": "adriencaccia"
+  },
   "ghData": {
-    "runId": 6957110437,
-    "job": "log-env",
-    "sender": {
-      "id": 19605940,
-      "login": "adriencaccia"
-    }
+    "runId": "6957110437",
+    "job": "log-env"
   },
+  "glData": null,
   "repositoryRootPath": "/home/runner/work/adrien-python-test/adrien-python-test/"
 }

src/run/ci_provider/github_actions/snapshots/codspeed__run__ci_provider__github_actions__provider__tests__pull_request_provider_metadata.snap

@@ -9,13 +9,14 @@ expression: provider_metadata
   "owner": "my-org",
   "repository": "adrien-python-test",
   "event": "pull_request",
+  "sender": {
+    "id": "19605940",
+    "login": "adriencaccia"
+  },
   "ghData": {
-    "runId": 6957110437,
-    "job": "log-env",
-    "sender": {
-      "id": 19605940,
-      "login": "adriencaccia"
-    }
+    "runId": "6957110437",
+    "job": "log-env"
   },
+  "glData": null,
   "repositoryRootPath": "/home/runner/work/adrien-python-test/adrien-python-test/"
 }