diff --git a/backend/substitute_ee_code.sh b/backend/substitute_ee_code.sh index 97a14b06c0..d7f98bf0fe 100755 --- a/backend/substitute_ee_code.sh +++ b/backend/substitute_ee_code.sh @@ -71,7 +71,7 @@ if [ "$REVERT" == "YES" ]; then ce_file="${ee_file/${EE_CODE_DIR}/.}" ce_file="${root_dirpath}/backend/${ce_file}" if [ "$REVERT_PREVIOUS" == "YES" ]; then - git checkout HEAD@{15} ${ce_file} || true + git checkout HEAD@{5} ${ce_file} || true else git restore --staged ${ce_file} || true git restore ${ce_file} || true diff --git a/backend/windmill-common/src/ee.rs b/backend/windmill-common/src/ee.rs index d3ffd98584..fbf94c4d77 100644 --- a/backend/windmill-common/src/ee.rs +++ b/backend/windmill-common/src/ee.rs @@ -1,5 +1,5 @@ use crate::ee::LicensePlan::Community; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use std::sync::Arc; use tokio::sync::RwLock; @@ -20,8 +20,10 @@ pub async fn get_license_plan() -> LicensePlan { return Community; } -#[derive(Deserialize)] -#[serde(untagged)] -pub enum CriticalErrorChannel {} +pub async fn trigger_critical_error_channels(_x: String) { + //not open-source + () +} -pub async fn trigger_critical_error_channels(_error_message: String) {} +#[derive(Serialize, Deserialize)] +pub enum CriticalErrorChannel {} diff --git a/cli/flow.ts b/cli/flow.ts index 731026ba7a..1d4fb69249 100644 --- a/cli/flow.ts +++ b/cli/flow.ts @@ -71,6 +71,8 @@ export async function pushFlow( } } else if (m.value.type == "forloopflow") { replaceInlineScripts(m.value.modules); + } else if (m.value.type == "whileloopflow") { + replaceInlineScripts(m.value.modules); } else if (m.value.type == "branchall") { m.value.branches.forEach((b) => replaceInlineScripts(b.modules)); } else if (m.value.type == "branchone") { diff --git a/cli/script.ts b/cli/script.ts index b8d2647268..ff68ba19f6 100644 --- a/cli/script.ts +++ b/cli/script.ts @@ -208,6 +208,7 @@ export async function handleFile( no_main_func: typed?.no_main_func, priority: typed?.priority, codebase: codebase?.digest, + timeout: typed?.timeout, }; if (remote) { @@ -236,7 +237,8 @@ export async function handleFile( Boolean(typed.visible_to_runner_only) == Boolean(remote.visible_to_runner_only) && Boolean(typed.no_main_func) == Boolean(remote.no_main_func) && - typed.priority == Boolean(remote.priority)) + typed.priority == Boolean(remote.priority) && + typed.timeout == remote.timeout) ) { log.info(colors.green(`Script ${remotePath} is up to date`)); return true; diff --git a/cli/sync.ts b/cli/sync.ts index 3255723a3f..1b2340e9fd 100644 --- a/cli/sync.ts +++ b/cli/sync.ts @@ -43,7 +43,7 @@ import { import { handleFile } from "./script.ts"; import { deepEqual } from "./utils.ts"; -import { Codebase, SyncOptions, mergeConfigWithConfigFile } from "./conf.ts"; +import { SyncOptions, mergeConfigWithConfigFile } from "./conf.ts"; import { removePathPrefix } from "./types.ts"; import { SyncCodebase, listSyncCodebases } from "./codebase.ts";