circus-evaluator: migrate evix 0.3.3 -> 2.0.1; eval fixes

.deny.toml

@@ -26,6 +26,9 @@ exceptions = [
   { allow = [
     "EUPL-1.2",
   ], crate = "evix" },
+  { allow = [
+    "EUPL-1.2",
+  ], crate = "evix-protocol" },
   { allow = [
     "EUPL-1.2",
   ], crate = "cognos" },

Cargo.toml

@@ -153,7 +153,7 @@ jsonwebtoken = { version = "10.4.0", default-features = false }
 
 # In-house crates and Nix utilities
 cognos = "1.0.0"
-evix   = { version = "0.3.3", features = [ "flake" ] }
+evix   = { version = "2.0.1", features = [ "flake" ] }
 
 # Workspace Clippy lints. All workspace crates must inherit them in individual
 # manifests for subcrates. The below list is a rather pedantic list of lints

circus.example.toml

@@ -38,10 +38,11 @@ enabled        = true
 # text   = "#0f172a"
 
 [evaluator]
-allow_ifd            = false
-auto_allowed_uris    = true
-git_timeout          = 600
-nix_timeout          = 1800
+allow_ifd         = false
+auto_allowed_uris = true
+git_timeout       = 600
+nix_timeout       = 1800
+# max_eval_time      = 3600
 poll_interval        = 60
 require_locked_flake = false
 restrict_eval        = true

crates/circus/build.rs

@@ -0,0 +1,6 @@
+fn main() {
+  // Keep the vendored git2 copy from interposing nix-bindings' libgit2.so.
+  if std::env::var("CARGO_CFG_TARGET_OS").as_deref() == Ok("linux") {
+    println!("cargo:rustc-link-arg-bins=-Wl,--exclude-libs,ALL");
+  }
+}

crates/common/src/models.rs

@@ -67,13 +67,15 @@ pub struct Evaluation {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, sqlx::Type)]
-#[serde(rename_all = "lowercase")]
-#[sqlx(type_name = "text", rename_all = "lowercase")]
+#[serde(rename_all = "snake_case")]
+#[sqlx(type_name = "text", rename_all = "snake_case")]
 pub enum EvaluationStatus {
   Pending,
   Running,
   Completed,
   Failed,
+  Cancelled,
+  TimedOut,
 }
 
 impl EvaluationStatus {
@@ -82,6 +84,8 @@ impl EvaluationStatus {
     match self {
       Self::Completed => ("Completed", "completed"),
       Self::Failed => ("Failed", "failed"),
+      Self::Cancelled => ("Cancelled", "cancelled"),
+      Self::TimedOut => ("Timed out", "timed-out"),
       Self::Running => ("Running", "running"),
       Self::Pending => ("Pending", "pending"),
     }
@@ -509,7 +513,7 @@ impl<'r> sqlx::Decode<'r, sqlx::Postgres> for BuildStatus {
 
 #[cfg(test)]
 mod build_status_tests {
-  use super::BuildStatus;
+  use super::{BuildStatus, EvaluationStatus};
 
   #[test]
   fn build_status_i32_round_trips() {
@@ -540,6 +544,15 @@ mod build_status_tests {
     assert_eq!(BuildStatus::from_i32(-1), None);
     assert_eq!(BuildStatus::from_i32(15), None);
   }
+
+  #[test]
+  fn timed_out_status_uses_database_spelling() {
+    assert_eq!(
+      serde_json::to_string(&EvaluationStatus::TimedOut)
+        .expect("EvaluationStatus serializes"),
+      "\"timed_out\""
+    );
+  }
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, FromRow)]

crates/common/src/repo/build_dependencies.rs

@@ -1,4 +1,4 @@
-use sqlx::PgPool;
+use sqlx::{Executor, PgPool, Postgres, Transaction};
 use uuid::Uuid;
 
 use crate::{
@@ -17,13 +17,37 @@ pub async fn create(
   build_id: Uuid,
   dependency_build_id: Uuid,
 ) -> Result<BuildDependency> {
+  create_with(pool, build_id, dependency_build_id).await
+}
+
+/// Create a build dependency relationship within an existing transaction.
+///
+/// # Errors
+///
+/// Returns an error if database insert fails or dependency already exists.
+pub async fn create_in_transaction(
+  tx: &mut Transaction<'_, Postgres>,
+  build_id: Uuid,
+  dependency_build_id: Uuid,
+) -> Result<BuildDependency> {
+  create_with(&mut **tx, build_id, dependency_build_id).await
+}
+
+async fn create_with<'e, E>(
+  executor: E,
+  build_id: Uuid,
+  dependency_build_id: Uuid,
+) -> Result<BuildDependency>
+where
+  E: Executor<'e, Database = Postgres>,
+{
   sqlx::query_as::<_, BuildDependency>(
     "INSERT INTO build_dependencies (build_id, dependency_build_id) VALUES \
      ($1, $2) RETURNING *",
   )
   .bind(build_id)
   .bind(dependency_build_id)
-  .fetch_one(pool)
+  .fetch_one(executor)
   .await
   .on_unique_violation(|| {
     format!(