add cloud compile flag

This commit is contained in:
Ruben Fiszel
2024-05-02 09:39:40 +02:00
parent 4f8d442479
commit b2d9f7d717
5 changed files with 8 additions and 6 deletions
+2 -2
View File
@@ -136,7 +136,7 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
build-args: |
features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud
tags: |
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-ee:dev
${{ steps.meta-ee-public.outputs.tags }}
@@ -199,7 +199,7 @@ jobs:
platforms: linux/amd64
push: true
build-args: |
features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect
features=enterprise,enterprise_saml,stripe,embedding,parquet,prometheus,openidconnect,cloud
PYTHON_IMAGE=python:3.12.2-slim-bookworm
tags: |
${{ steps.meta-ee-public-py312.outputs.tags }}
+1
View File
@@ -50,6 +50,7 @@ parquet = ["windmill-api/parquet", "windmill-common/parquet", "windmill-worker/p
prometheus = ["windmill-common/prometheus", "windmill-api/prometheus", "windmill-worker/prometheus", "windmill-queue/prometheus"]
flow_testing = ["windmill-worker/flow_testing"]
openidconnect = ["windmill-api/openidconnect"]
cloud = ["windmill-queue/cloud"]
[dependencies]
anyhow.workspace = true
+1
View File
@@ -11,6 +11,7 @@ path = "src/lib.rs"
[features]
default = []
enterprise = ["windmill-common/enterprise"]
cloud = []
benchmark = []
prometheus = ["dep:prometheus"]
+2 -2
View File
@@ -699,7 +699,7 @@ pub async fn add_completed_job<
queued_job.id
);
#[cfg(feature = "enterprise")]
#[cfg(feature = "cloud")]
if *CLOUD_HOSTED && !queued_job.is_flow() && _duration > 1000 {
let additional_usage = _duration / 1000;
let w_id = &queued_job.workspace_id;
@@ -2624,7 +2624,7 @@ pub async fn push<'c, T: Serialize + Send + Sync, R: rsmq_async::RsmqConnection
flow_step_id: Option<String>,
_priority_override: Option<i16>,
) -> Result<(Uuid, QueueTransaction<'c, R>), Error> {
#[cfg(feature = "enterprise")]
#[cfg(feature = "cloud")]
if *CLOUD_HOSTED {
let premium_workspace =
sqlx::query_scalar!("SELECT premium FROM workspace WHERE id = $1", workspace_id)
+2 -2
View File
@@ -1160,7 +1160,7 @@ pub async fn resolve_job_timeout(
custom_timeout_secs: Option<i32>,
) -> (Duration, Option<String>) {
let mut warn_msg: Option<String> = None;
#[cfg(feature = "enterprise")]
#[cfg(feature = "cloud")]
let cloud_premium_workspace = *CLOUD_HOSTED
&& sqlx::query_scalar!("SELECT premium FROM workspace WHERE id = $1", _w_id)
.fetch_one(_db)
@@ -1169,7 +1169,7 @@ pub async fn resolve_job_timeout(
tracing::error!(%e, "error getting premium workspace for job {_job_id}: {e}");
})
.unwrap_or(false);
#[cfg(not(feature = "enterprise"))]
#[cfg(not(feature = "cloud"))]
let cloud_premium_workspace = false;
// compute global max timeout