From 60b45e70adedf79580c96a9a7eb0ec6dede4a6a4 Mon Sep 17 00:00:00 2001 From: Lennart <18233294+lennart-k@users.noreply.github.com> Date: Thu, 15 Jan 2026 22:31:40 +0100 Subject: [PATCH] fix docker builds --- ...7d4f295ccc2534dcc4b3bd710de773ed137f9.json | 12 ++++++ ...93dddc6c7ff92ac7b8ba44049d31df3c680e3.json | 12 ++++++ ...4805d1e71d24888f2227045afd90bf080fc23.json | 38 +++++++++++++++++++ Cargo.lock | 36 +++++++++--------- Cargo.toml | 6 +-- 5 files changed, 82 insertions(+), 22 deletions(-) create mode 100644 .sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json create mode 100644 .sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json create mode 100644 .sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json diff --git a/.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json b/.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json new file mode 100644 index 0000000..ecf901c --- /dev/null +++ b/.sqlx/query-146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "DELETE FROM calendarobjectchangelog WHERE (principal, cal_id, object_id) = (?, ?, ?);", + "describe": { + "columns": [], + "parameters": { + "Right": 3 + }, + "nullable": [] + }, + "hash": "146e23ae4e0eaae4d65ac7563c67d4f295ccc2534dcc4b3bd710de773ed137f9" +} diff --git a/.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json b/.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json new file mode 100644 index 0000000..1ca63c7 --- /dev/null +++ b/.sqlx/query-354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3.json @@ -0,0 +1,12 @@ +{ + "db_name": "SQLite", + "query": "UPDATE calendarobjects SET ics = ? WHERE (principal, cal_id, id) = (?, ?, ?);", + "describe": { + "columns": [], + "parameters": { + "Right": 4 + }, + "nullable": [] + }, + "hash": "354decac84758c88280f60fbf0f93dddc6c7ff92ac7b8ba44049d31df3c680e3" +} diff --git a/.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json b/.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json new file mode 100644 index 0000000..91e7abe --- /dev/null +++ b/.sqlx/query-bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23.json @@ -0,0 +1,38 @@ +{ + "db_name": "SQLite", + "query": "SELECT principal, cal_id, id, ics FROM calendarobjects WHERE ics LIKE '%VERSION:4.0%';", + "describe": { + "columns": [ + { + "name": "principal", + "ordinal": 0, + "type_info": "Text" + }, + { + "name": "cal_id", + "ordinal": 1, + "type_info": "Text" + }, + { + "name": "id", + "ordinal": 2, + "type_info": "Text" + }, + { + "name": "ics", + "ordinal": 3, + "type_info": "Text" + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false, + false, + false, + false + ] + }, + "hash": "bdaa4bee8b01d0e3773e34672ed4805d1e71d24888f2227045afd90bf080fc23" +} diff --git a/Cargo.lock b/Cargo.lock index 2f7d4b8..9e84db0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "ical" version = "0.11.0" -source = "git+https://github.com/lennart-k/ical-rs#dcd3b106758a054f46a5172103abb17972ad032d" +source = "git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3#7c2ab1f3abdca768f22d8a36627eebbdd7947e29" dependencies = [ "chrono", "chrono-tz", @@ -3332,7 +3332,7 @@ dependencies = [ [[package]] name = "rustical" -version = "0.11.14" +version = "0.11.15" dependencies = [ "anyhow", "argon2", @@ -3378,7 +3378,7 @@ dependencies = [ [[package]] name = "rustical_caldav" -version = "0.11.14" +version = "0.11.15" dependencies = [ "async-std", "async-trait", @@ -3391,7 +3391,7 @@ dependencies = [ "futures-util", "headers", "http", - "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)", + "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)", "insta", "percent-encoding", "quick-xml", @@ -3420,7 +3420,7 @@ dependencies = [ [[package]] name = "rustical_carddav" -version = "0.11.14" +version = "0.11.15" dependencies = [ "async-trait", "axum", @@ -3430,7 +3430,7 @@ dependencies = [ "derive_more", "futures-util", "http", - "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)", + "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)", "insta", "percent-encoding", "quick-xml", @@ -3454,7 +3454,7 @@ dependencies = [ [[package]] name = "rustical_dav" -version = "0.11.14" +version = "0.11.15" dependencies = [ "async-trait", "axum", @@ -3463,7 +3463,7 @@ dependencies = [ "futures-util", "headers", "http", - "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)", + "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)", "itertools 0.14.0", "log", "matchit 0.9.1", @@ -3480,7 +3480,7 @@ dependencies = [ [[package]] name = "rustical_dav_push" -version = "0.11.14" +version = "0.11.15" dependencies = [ "async-trait", "axum", @@ -3505,7 +3505,7 @@ dependencies = [ [[package]] name = "rustical_frontend" -version = "0.11.14" +version = "0.11.15" dependencies = [ "askama", "askama_web", @@ -3541,13 +3541,13 @@ dependencies = [ [[package]] name = "rustical_ical" -version = "0.11.14" +version = "0.11.15" dependencies = [ "axum", "chrono", "chrono-tz", "derive_more", - "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)", + "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)", "regex", "rrule", "rstest", @@ -3560,7 +3560,7 @@ dependencies = [ [[package]] name = "rustical_oidc" -version = "0.11.14" +version = "0.11.15" dependencies = [ "async-trait", "axum", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "rustical_store" -version = "0.11.14" +version = "0.11.15" dependencies = [ "anyhow", "async-trait", @@ -3588,7 +3588,7 @@ dependencies = [ "futures-core", "headers", "http", - "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs)", + "ical 0.11.0 (git+https://github.com/lennart-k/ical-rs?rev=7c2ab1f3)", "regex", "rrule", "rstest", @@ -3609,7 +3609,7 @@ dependencies = [ [[package]] name = "rustical_store_sqlite" -version = "0.11.14" +version = "0.11.15" dependencies = [ "async-trait", "chrono", @@ -3633,7 +3633,7 @@ dependencies = [ [[package]] name = "rustical_xml" -version = "0.11.14" +version = "0.11.15" dependencies = [ "quick-xml", "thiserror 2.0.17", @@ -5457,7 +5457,7 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "xml_derive" -version = "0.11.14" +version = "0.11.15" dependencies = [ "darling 0.23.0", "heck", diff --git a/Cargo.toml b/Cargo.toml index 70ba138..a7cc97b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ members = ["crates/*"] [workspace.package] -version = "0.11.14" +version = "0.11.15" rust-version = "1.92" edition = "2024" description = "A CalDAV server" @@ -107,9 +107,7 @@ strum = "0.27" strum_macros = "0.27" serde_json = { version = "1.0", features = ["raw_value"] } sqlx-sqlite = { version = "0.8", features = ["bundled"] } -ical = { git = "https://github.com/lennart-k/ical-rs", features = [ - "chrono-tz", -] } +ical = { git = "https://github.com/lennart-k/ical-rs", rev = "7c2ab1f3" } toml = "0.9" tower = "0.5" tower-http = { version = "0.6", features = [