Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Update Rust dependencies and report unrelated CI failures

Manav Rathi013241612bba
diff --git a/.github/scripts/dependencies.md b/.github/scripts/dependencies.md
index b046c2f134..216c545915 100644
--- a/.github/scripts/dependencies.md
+++ b/.github/scripts/dependencies.md
@@ -8,7 +8,7 @@ Investigate the release changes and how we use each dependency. Classify which u
Fix mechanical problems and make necessary coordinated changes across consumers and platforms. Investigate updates that need adaptation rather than immediately excluding them. Respect deliberate pins and existing exceptions. New or broader Dependabot exceptions require human approval; recommend them in the report.
-Validate the changes with relevant builds and tests. Where existing coverage is insufficient, establish what would give us confidence; for migrations, compare behavior before and after the update.
+Validate the changes with relevant builds and tests. Where existing coverage is insufficient, establish what would give us confidence; for migrations, compare behavior before and after the update. Report CI failures unrelated to these dependency updates as blockers; do not fix them.
Keep the updates we can confidently accept. Leave out those requiring a human decision or further work, without blocking independent updates.
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 2b11348063..2f651226ed 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2443,7 +2443,7 @@ dependencies = [
"mockito",
"serde",
"serde_json",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"srp",
"subtle",
"thiserror 2.0.21",
@@ -2462,7 +2462,7 @@ dependencies = [
"reqwest 0.12.28",
"serde",
"serde_json",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"tar",
"thiserror 2.0.21",
"tokio",
@@ -2551,7 +2551,7 @@ dependencies = [
"same-file",
"serde",
"serde_json",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"tempfile",
"thiserror 2.0.21",
"tokio",
@@ -2610,7 +2610,7 @@ dependencies = [
"serde",
"serde_json",
"sha1 0.11.0",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"subtle",
"thiserror 2.0.21",
"tokio",
@@ -2651,7 +2651,7 @@ version = "0.0.0"
dependencies = [
"ente-core",
"hkdf 0.13.0",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"thiserror 2.0.21",
]
@@ -2737,7 +2737,7 @@ dependencies = [
"serde",
"serde_json",
"sha1 0.11.0",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"thiserror 2.0.21",
"tokio",
"uuid",
@@ -2774,7 +2774,7 @@ dependencies = [
"geo",
"reqwest 0.12.28",
"rusqlite",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"shapefile",
"thiserror 2.0.21",
"zip",
@@ -2818,7 +2818,7 @@ dependencies = [
"fast_image_resize",
"flate2",
"half",
- "html-escape",
+ "html-escape 0.3.0",
"image",
"imageproc",
"log",
@@ -4272,7 +4272,7 @@ dependencies = [
"hybrid-array",
"ml-kem",
"rand_core 0.10.1",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"sha3 0.12.0",
"shake",
"subtle",
@@ -4288,6 +4288,12 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9356095b4b41197bba32173600e1582792cda618f65d12f68e2e77d273413c5"
+[[package]]
+name = "html-escape"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "491194d601b4fa9fac3c9571e014070a0ad1bc3392d1bc10419695196a8b3cc3"
+
[[package]]
name = "html5ever"
version = "0.39.0"
@@ -7209,7 +7215,7 @@ dependencies = [
"encoding",
"encoding_rs",
"fancy-regex",
- "html-escape",
+ "html-escape 0.2.15",
"icu",
"lazy_static",
"oem_cp",
@@ -8828,9 +8834,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.11.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4"
+checksum = "47d7069beb7d6ac7b9acd1039986e73443f24234f41074da099d6f994ac9ad19"
dependencies = [
"cfg-if",
"cpufeatures 0.3.0",
@@ -9183,7 +9189,7 @@ dependencies = [
"rand 0.10.1",
"serde",
"serde_json",
- "sha2 0.11.0",
+ "sha2 0.11.1",
"smallvec",
"sqlx-core",
"stringprep",
@@ -9489,9 +9495,9 @@ checksum = "591ef38edfb78ca4771ee32cf494cb8771944bee237a9b91fc9c1424ac4b777b"
[[package]]
name = "tauri"
-version = "2.12.3"
+version = "2.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c404ecf956ff241bf6b39dd688614724e1bf1f63255abb4fc46d1c40371672ea"
+checksum = "f316751027fc2644221d1a448564d519efb07067fda584879d9cda966391d212"
dependencies = [
"anyhow",
"bytes",
@@ -9620,9 +9626,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-dialog"
-version = "2.8.2"
+version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca325d6e66e9170f2e1b9631722e4e544bcbc51781575d266abdaba697bd51"
+checksum = "b7461aaacf1901915ea7b9f5cd74f8224a351ed96af0a62c07fce934003cb34b"
dependencies = [
"log",
"raw-window-handle",
@@ -9662,9 +9668,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-opener"
-version = "2.7.1"
+version = "2.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85dead674ee41937d042ee855d785f07ee67206f19402200c12b9255964d5ac8"
+checksum = "53810be1b4fed22bb6ac3f4cab5a2b80d9391d1af436bda145607532bc0bb219"
dependencies = [
"dunce",
"glob",
@@ -9694,9 +9700,9 @@ dependencies = [
[[package]]
name = "tauri-plugin-single-instance"
-version = "2.5.3"
+version = "2.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c142ed88deee222bd2d979269d35c73b6c1c0f6ebd5b79b4ff80066fcad6af1"
+checksum = "561cd99484561bc39c954768e7b41a66cebbe1ac3d9d081c34361f740c489e2c"
dependencies = [
"serde",
"serde_json",
@@ -9743,9 +9749,9 @@ dependencies = [
[[package]]
name = "tauri-runtime"
-version = "2.12.1"
+version = "2.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2a57a2a9b8c8b7fc00d35b510fe808ded7f9f1b44fc1cdda6aee38632ea5413"
+checksum = "7c55766d99cea69055904d1735b93c2049302b2e09effd462120deb5581d78e9"
dependencies = [
"cookie",
"dpi",
@@ -9768,9 +9774,9 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
-version = "2.12.1"
+version = "2.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e7e0c9f80a5130773cfabb6df4dc924518fb1b2c923726966804634b57d22"
+checksum = "e1aa9d8b7a120f879f44fdc1053f7b7dbf416bf0bbc6a72b714dec46b782b52f"
dependencies = [
"gtk",
"http",
@@ -9778,7 +9784,6 @@ dependencies = [
"log",
"objc2",
"objc2-app-kit",
- "once_cell",
"percent-encoding",
"raw-window-handle",
"softbuffer",
@@ -10020,9 +10025,9 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8"
[[package]]
name = "tokio"
-version = "1.53.2"
+version = "1.54.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044"
+checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3"
dependencies = [
"bytes",
"libc",
diff --git a/rust/apps/ensu/package-lock.json b/rust/apps/ensu/package-lock.json
index 3cd8e4c0a8..4ba07e5b77 100644
--- a/rust/apps/ensu/package-lock.json
+++ b/rust/apps/ensu/package-lock.json
@@ -9,9 +9,9 @@
"version": "0.1.23-beta",
"dependencies": {
"@tauri-apps/api": "2.12.1",
- "@tauri-apps/plugin-dialog": "2.8.2",
+ "@tauri-apps/plugin-dialog": "2.8.3",
"@tauri-apps/plugin-fs": "2.7.1",
- "@tauri-apps/plugin-opener": "2.7.1",
+ "@tauri-apps/plugin-opener": "2.7.2",
"@tauri-apps/plugin-process": "2.4.0",
"@tauri-apps/plugin-updater": "2.14.0"
},
@@ -262,9 +262,9 @@
}
},
"node_modules/@tauri-apps/plugin-dialog": {
- "version": "2.8.2",
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.8.2.tgz",
- "integrity": "sha512-LFqp8OTx0bHOwhKRhMMDyRDlo/2IO5XxoOclpf8+yvjAfM2ytVdbB6tk63dBlicsR8pRw38maj/GxrU6cW8mXw==",
+ "version": "2.8.3",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.8.3.tgz",
+ "integrity": "sha512-Hd/yBfk2R5v2MFrz/0VArSXeh8xKLLXGunqSiTtcHKn1zNZwaKujuA0VSwUvNfwC4hDoF1PveS+gBDNe3nHspw==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.12.0"
@@ -280,9 +280,9 @@
}
},
"node_modules/@tauri-apps/plugin-opener": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.7.1.tgz",
- "integrity": "sha512-XkXdt30rontti9TII/gBBxFRXWfj8DiprFW7RgBFRBj1OhdfjBNVcFqSEWkkZ4hXafHnuEnB7F1sFsmu6uyywQ==",
+ "version": "2.7.2",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.7.2.tgz",
+ "integrity": "sha512-LyybP1VSzTMQiaFYcsbAse47KpivlyXdLZMQzGLEnkgQacGESnpjAfFoQ6h5sqWgAdZDH9szYjPzHMpv0Sz+TQ==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.12.0"
diff --git a/rust/apps/ensu/package.json b/rust/apps/ensu/package.json
index 2972573d84..cb3760e991 100644
--- a/rust/apps/ensu/package.json
+++ b/rust/apps/ensu/package.json
@@ -9,9 +9,9 @@
},
"dependencies": {
"@tauri-apps/api": "2.12.1",
- "@tauri-apps/plugin-dialog": "2.8.2",
+ "@tauri-apps/plugin-dialog": "2.8.3",
"@tauri-apps/plugin-fs": "2.7.1",
- "@tauri-apps/plugin-opener": "2.7.1",
+ "@tauri-apps/plugin-opener": "2.7.2",
"@tauri-apps/plugin-process": "2.4.0",
"@tauri-apps/plugin-updater": "2.14.0"
},
diff --git a/rust/crates/ml/Cargo.toml b/rust/crates/ml/Cargo.toml
index bc725b6c72..d2e90f5164 100644
--- a/rust/crates/ml/Cargo.toml
+++ b/rust/crates/ml/Cargo.toml
@@ -12,7 +12,7 @@ ente-assets.workspace = true
ente-image.workspace = true
fast_image_resize = { workspace = true, features = ["rayon"] }
half = "2.1.0"
-html-escape = "0.2.13"
+html-escape = "0.3.0"
image.workspace = true
imageproc = "0.27.0"
log.workspace = true
diff --git a/rust/crates/ml/src/clip/tokenizer.rs b/rust/crates/ml/src/clip/tokenizer.rs
index af7fe4e40b..f88142124f 100644
--- a/rust/crates/ml/src/clip/tokenizer.rs
+++ b/rust/crates/ml/src/clip/tokenizer.rs
@@ -344,6 +344,7 @@ mod tests {
fn basic_clean_matches_ftfy_style_repairs() {
assert_eq!(basic_clean(" Òœ” No problems "), "βœ” No problems");
assert_eq!(basic_clean("Tom & Jerry"), "Tom & Jerry");
+ assert_eq!(basic_clean("fj ≂̸"), "fj ≂̸");
assert_eq!(basic_clean("A B"), "A B");
assert_eq!(basic_clean("AB"), "AB");
}
diff --git a/web/apps/ensu/package.json b/web/apps/ensu/package.json
index 4ab8616a12..d906240707 100644
--- a/web/apps/ensu/package.json
+++ b/web/apps/ensu/package.json
@@ -9,9 +9,9 @@
"@hugeicons/core-free-icons": "4.3.5",
"@hugeicons/react": "1.1.10",
"@tauri-apps/api": "2.12.1",
- "@tauri-apps/plugin-dialog": "2.8.2",
+ "@tauri-apps/plugin-dialog": "2.8.3",
"@tauri-apps/plugin-fs": "2.7.1",
- "@tauri-apps/plugin-opener": "2.7.1",
+ "@tauri-apps/plugin-opener": "2.7.2",
"@tauri-apps/plugin-process": "2.4.0",
"@tauri-apps/plugin-updater": "2.14.0",
"@wllama/wllama": "2.4.0",
diff --git a/web/package-lock.json b/web/package-lock.json
index 0061f27d0f..31d0263ca6 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -163,9 +163,9 @@
"@hugeicons/core-free-icons": "4.3.5",
"@hugeicons/react": "1.1.10",
"@tauri-apps/api": "2.12.1",
- "@tauri-apps/plugin-dialog": "2.8.2",
+ "@tauri-apps/plugin-dialog": "2.8.3",
"@tauri-apps/plugin-fs": "2.7.1",
- "@tauri-apps/plugin-opener": "2.7.1",
+ "@tauri-apps/plugin-opener": "2.7.2",
"@tauri-apps/plugin-process": "2.4.0",
"@tauri-apps/plugin-updater": "2.14.0",
"@wllama/wllama": "2.4.0",
@@ -3590,9 +3590,9 @@
}
},
"node_modules/@tauri-apps/plugin-dialog": {
- "version": "2.8.2",
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.8.2.tgz",
- "integrity": "sha512-LFqp8OTx0bHOwhKRhMMDyRDlo/2IO5XxoOclpf8+yvjAfM2ytVdbB6tk63dBlicsR8pRw38maj/GxrU6cW8mXw==",
+ "version": "2.8.3",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.8.3.tgz",
+ "integrity": "sha512-Hd/yBfk2R5v2MFrz/0VArSXeh8xKLLXGunqSiTtcHKn1zNZwaKujuA0VSwUvNfwC4hDoF1PveS+gBDNe3nHspw==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.12.0"
@@ -3608,9 +3608,9 @@
}
},
"node_modules/@tauri-apps/plugin-opener": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.7.1.tgz",
- "integrity": "sha512-XkXdt30rontti9TII/gBBxFRXWfj8DiprFW7RgBFRBj1OhdfjBNVcFqSEWkkZ4hXafHnuEnB7F1sFsmu6uyywQ==",
+ "version": "2.7.2",
+ "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-opener/-/plugin-opener-2.7.2.tgz",
+ "integrity": "sha512-LyybP1VSzTMQiaFYcsbAse47KpivlyXdLZMQzGLEnkgQacGESnpjAfFoQ6h5sqWgAdZDH9szYjPzHMpv0Sz+TQ==",
"license": "MIT OR Apache-2.0",
"dependencies": {
"@tauri-apps/api": "^2.12.0"