From 556c9bc4b35c71baf067ccb7793e7a7c142056ea Mon Sep 17 00:00:00 2001 From: Sienna Meridian Satterwhite Date: Mon, 6 Apr 2026 19:42:45 +0100 Subject: [PATCH] fix: pin icu_calendar <2.2 to work around temporal_rs/deno_core incompatibility --- .cargo/config.toml | 3 +++ .gitignore | 2 +- Cargo.toml | 3 ++- wfe-deno/Cargo.toml | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 22c6871..81bb291 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,5 @@ +[build] +rustc-wrapper = "/opt/homebrew/bin/sccache" + [registries.sunbeam] index = "sparse+https://src.sunbeam.pt/api/packages/studio/cargo/" diff --git a/.gitignore b/.gitignore index 7f71f7a..e950654 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ Cargo.lock *.swp *.swo .DS_Store -.env +.env* diff --git a/Cargo.toml b/Cargo.toml index cb0cdbd..2c034e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["wfe-core", "wfe-sqlite", "wfe-postgres", "wfe-opensearch", "wfe-valkey", "wfe", "wfe-yaml", "wfe-buildkit", "wfe-containerd", "wfe-containerd-protos", "wfe-buildkit-protos", "wfe-rustlang", "wfe-server-protos", "wfe-server", "wfe-deno", "wfe-kubernetes"] +members = ["wfe-core", "wfe-sqlite", "wfe-postgres", "wfe-opensearch", "wfe-valkey", "wfe", "wfe-yaml", "wfe-buildkit", "wfe-containerd", "wfe-containerd-protos", "wfe-buildkit-protos", "wfe-rustlang", "wfe-server-protos", "wfe-server", "wfe-kubernetes", "wfe-deno"] resolver = "2" [workspace.package] @@ -56,6 +56,7 @@ regex = "1" # Deno runtime deno_core = "0.394" + deno_error = "0.7" url = "2" diff --git a/wfe-deno/Cargo.toml b/wfe-deno/Cargo.toml index 6cf6178..95e0ab7 100644 --- a/wfe-deno/Cargo.toml +++ b/wfe-deno/Cargo.toml @@ -19,6 +19,9 @@ async-trait = { workspace = true } tracing = { workspace = true } chrono = { workspace = true } +# Pin icu crates to 2.1.x -- icu 2.2 broke temporal_rs (deno_core transitive dep) +icu_calendar = ">=2.1, <2.2" + [dev-dependencies] pretty_assertions = { workspace = true } tokio = { workspace = true, features = ["test-util"] }