evaluate typhonJobs for the current system

typhon-ci · Sep 23, 2023 · 97bd460 · 97bd460
1 parent bfad10a
commit 97bd460
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/typhon/src/evaluations.rs b/typhon/src/evaluations.rs
@@ -6,6 +6,7 @@ use crate::schema::builds::dsl::*;
 use crate::schema::evaluations::dsl::*;
 use crate::schema::jobs::dsl::*;
 use crate::schema::jobsets::dsl::*;
+use crate::CURRENT_SYSTEM;
 use crate::EVALUATIONS;
 use crate::{handles, responses};
 use crate::{log_event, Event};
@@ -133,7 +134,10 @@ impl Evaluation {
         let handle = self.handle().await.unwrap(); // TODO
         let id = self.evaluation_id;
         let task = async move {
-            let expr = format!("{}#typhonJobs", self.evaluation_flake_locked);
+            let expr = format!(
+                "{}#typhonJobs.{}",
+                self.evaluation_flake_locked, *CURRENT_SYSTEM,
+            );
             let mut jobs_ = JobDrvMap::new();
             for job in nix::eval(expr.clone())
                 .await?

diff --git a/typhon/src/lib.rs b/typhon/src/lib.rs
@@ -110,6 +110,7 @@ pub static CONNECTION: Lazy<Connection> = Lazy::new(|| {
 pub static LISTENERS: Lazy<Mutex<listeners::Listeners>> =
     Lazy::new(|| Mutex::new(listeners::Listeners::new()));
 pub static BUILD_LOGS: Lazy<logs::live::Cache<nix::DrvPath>> = Lazy::new(logs::live::Cache::new);
+pub static CURRENT_SYSTEM: Lazy<String> = Lazy::new(nix::current_system);
 
 pub async fn connection<'a>() -> tokio::sync::MutexGuard<'a, SqliteConnection> {
     CONNECTION.conn.lock().await

diff --git a/typhon/src/nix.rs b/typhon/src/nix.rs
@@ -295,6 +295,23 @@ pub async fn eval(expr: String) -> Result<serde_json::Value, Error> {
     )?)
 }
 
+pub fn current_system() -> String {
+    String::from_utf8(
+        std::process::Command::new("nix")
+            .args([
+                "eval",
+                "--impure",
+                "--raw",
+                "--expr",
+                "builtins.currentSystem",
+            ])
+            .output()
+            .unwrap()
+            .stdout,
+    )
+    .unwrap()
+}
+
 pub async fn lock(flake_url: &String) -> Result<String, Error> {
     let output = Command::nix(["flake", "metadata", "--refresh", "--json"])
         .arg(flake_url.clone())