diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index fb1a717f9c..cd2c81c45a 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -98bae7801a0d21d6a1608cd150533cad365d84ce \ No newline at end of file +7c9d175d7580530189bf4d41ac1edc438be0470a \ No newline at end of file diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs index 30dd99e188..5fa2670c5d 100644 --- a/backend/tests/worker.rs +++ b/backend/tests/worker.rs @@ -121,7 +121,9 @@ fn next_worker_name() -> String { pub struct ApiServer { pub addr: std::net::SocketAddr, + #[allow(unused)] tx: tokio::sync::broadcast::Sender<()>, + #[allow(unused)] task: tokio::task::JoinHandle>, } @@ -155,6 +157,7 @@ impl ApiServer { Self { addr, tx, task } } + #[allow(unused)] async fn close(self) -> anyhow::Result<()> { println!("closing api server"); let Self { tx, task, .. } = self; @@ -195,11 +198,13 @@ async fn set_jwt_secret() -> () { } mod suspend_resume { - + #[cfg(feature = "deno_core")] use serde_json::json; + #[cfg(feature = "deno_core")] use super::*; + #[cfg(feature = "deno_core")] async fn wait_until_flow_suspends( flow: Uuid, mut queue: impl Stream + Unpin, @@ -220,6 +225,7 @@ mod suspend_resume { } } + #[cfg(feature = "deno_core")] fn flow() -> FlowValue { serde_json::from_value(serde_json::json!({ "modules": [{ @@ -464,12 +470,12 @@ mod suspend_resume { } } +#[cfg(feature = "deno_core")] mod retry { + use super::*; use serde_json::json; use tokio::io::{AsyncReadExt, AsyncWriteExt}; - use super::*; - /// test helper provides some external state to help steps fail at specific points struct Server { addr: std::net::SocketAddr, @@ -538,6 +544,7 @@ def main(last, port): "# } + #[cfg(feature = "deno_core")] fn flow_forloop_retry() -> FlowValue { serde_json::from_value(serde_json::json!({ "modules": [{ @@ -1075,6 +1082,7 @@ async fn listen_for_completed_jobs(db: &Pool) -> impl Stream) -> impl Stream + Unpin { listen_for_uuid_on(db, "queued").await } diff --git a/backend/windmill-api/src/utils.rs b/backend/windmill-api/src/utils.rs index c9cffa678c..5dd93b53da 100644 --- a/backend/windmill-api/src/utils.rs +++ b/backend/windmill-api/src/utils.rs @@ -8,7 +8,7 @@ use axum::{body::Body, response::Response}; use regex::Regex; -use serde::{Deserialize, Deserializer, Serialize}; +use serde::{Deserialize, Deserializer}; use sqlx::{Postgres, Transaction}; #[cfg(feature = "enterprise")] use windmill_common::worker::CLOUD_HOSTED; @@ -228,7 +228,8 @@ where Ok(o.filter(|s| !s.trim().is_empty())) } -#[derive(Serialize)] +#[cfg(feature = "enterprise")] +#[derive(serde::Serialize)] pub struct CriticalAlert { id: i32, alert_type: String, diff --git a/backend/windmill-common/src/stats_oss.rs b/backend/windmill-common/src/stats_oss.rs index f0f75ad0ed..4e388daf5c 100644 --- a/backend/windmill-common/src/stats_oss.rs +++ b/backend/windmill-common/src/stats_oss.rs @@ -6,7 +6,7 @@ pub use crate::stats_ee::*; use sqlx::Postgres; #[cfg(not(feature = "private"))] -use crate::{error::Result, scripts::ScriptLang, DB}; +use crate::{error::Result, DB}; #[cfg(not(feature = "private"))] pub async fn get_disable_stats_setting(_db: &DB) -> bool {