From 73463a8d214bf0543a976cf05be10ae9bfd15d60 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 15:21:58 -0700 Subject: [PATCH 01/13] initial CI impl --- .forgejo/build-service/action.yml | 17 ++++++++++++++ .forgejo/workflows/build-all.yml | 39 +++++++++++++++++++++++++++++++ asklyphe-common/Cargo.toml | 5 +++- asklyphe-common/src/lib.rs | 1 + searchservice/Cargo.toml | 2 +- 5 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 .forgejo/build-service/action.yml create mode 100644 .forgejo/workflows/build-all.yml diff --git a/.forgejo/build-service/action.yml b/.forgejo/build-service/action.yml new file mode 100644 index 0000000..6d71e5c --- /dev/null +++ b/.forgejo/build-service/action.yml @@ -0,0 +1,17 @@ +inputs: + service-name: + description: 'name of the service to build and upload' + required: true +runs: + using: "composite" + steps: + - uses: actions/checkout@v4 + - run: | + mkdir -pv artifacts + cargo build --release --bin ${{ inputs.service-name }} + mv target/release/${{ inputs.service-name }} artifacts/ + shell: bash + - uses: actions/upload-artifact@v3 + with: + name: "${{ inputs.service-name }}" + path: artifacts/ \ No newline at end of file diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml new file mode 100644 index 0000000..1c3f550 --- /dev/null +++ b/.forgejo/workflows/build-all.yml @@ -0,0 +1,39 @@ +on: [push] +jobs: + build-all-services: + runs-on: docker + container: + image: hub.docker.com/_/rust:1-bookworm + steps: + - id: asklyphe-auth-frontend + uses: ./.forgejo/build-service + with: + service-name: "asklyphe-auth-frontend" + - id: asklyphe-frontend + uses: ./.forgejo/build-service + with: + service-name: "asklyphe-frontend" + - id: authservice + uses: ./.forgejo/build-service + with: + service-name: "authservice" + - id: bingservice + uses: ./.forgejo/build-service + with: + service-name: "bingservice" + - id: googleservice + uses: ./.forgejo/build-service + with: + service-name: "googleservice" + - id: lyphedb + uses: ./.forgejo/build-service + with: + service-name: "lyphedb" + - id: searchservice + uses: ./.forgejo/build-service + with: + service-name: "searchservice" + - id: vorebot + uses: ./.forgejo/build-service + with: + service-name: "vorebot" diff --git a/asklyphe-common/Cargo.toml b/asklyphe-common/Cargo.toml index 4ad48ed..39a9691 100644 --- a/asklyphe-common/Cargo.toml +++ b/asklyphe-common/Cargo.toml @@ -12,7 +12,7 @@ tokio = { version = "1.0", features = ["full"] } chrono = "0.4.31" serde = { version = "1.0", features = ["derive"] } lyphedb = { path = "../lyphedb" } -foundationdb = { version = "0.8.0", features = ["embedded-fdb-include"] } +foundationdb = { version = "0.8.0", features = ["embedded-fdb-include"], optional = true } log = "0.4.20" rmp-serde = "1.1.2" futures = "0.3.30" @@ -20,3 +20,6 @@ async-nats = "0.38.0" ulid = "1.1.0" rand = "0.8.5" percent-encoding = "2.3.1" + +[features] +default = [] \ No newline at end of file diff --git a/asklyphe-common/src/lib.rs b/asklyphe-common/src/lib.rs index d87c55c..6a914b9 100644 --- a/asklyphe-common/src/lib.rs +++ b/asklyphe-common/src/lib.rs @@ -16,6 +16,7 @@ pub mod db; pub mod ldb; pub use lyphedb; +#[cfg(feature = "foundationdb")] pub use foundationdb; pub fn add(left: usize, right: usize) -> usize { diff --git a/searchservice/Cargo.toml b/searchservice/Cargo.toml index 6167503..ad88aa4 100644 --- a/searchservice/Cargo.toml +++ b/searchservice/Cargo.toml @@ -8,7 +8,7 @@ license-file = "LICENSE" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -asklyphe-common = { path = "../asklyphe-common" } +asklyphe-common = { path = "../asklyphe-common", features = ["foundationdb"] } tokio = { version = "1.0", features = ["full"] } serde = { version = "1.0", features = ["derive"] } rmp-serde = "1.1.2" -- 2.39.5 From a16782617a228f4fb8e89f85f160d24d239b1338 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:48:05 -0700 Subject: [PATCH 02/13] change image --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 1c3f550..97bdbc8 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -3,7 +3,7 @@ jobs: build-all-services: runs-on: docker container: - image: hub.docker.com/_/rust:1-bookworm + image: hub.docker.com/rust:1-bookworm steps: - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From a0b31d33267915c0445bd51857e76a6851ae7229 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:48:33 -0700 Subject: [PATCH 03/13] change image to docker.io --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 97bdbc8..d3f9ab1 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -3,7 +3,7 @@ jobs: build-all-services: runs-on: docker container: - image: hub.docker.com/rust:1-bookworm + image: hub.docker.io/rust:1-bookworm steps: - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From 949a49e5de0a35ca6caf3b2af313a2ed6996ca09 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:49:01 -0700 Subject: [PATCH 04/13] nvm --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index d3f9ab1..d834f16 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -3,7 +3,7 @@ jobs: build-all-services: runs-on: docker container: - image: hub.docker.io/rust:1-bookworm + image: rust:1-bookworm steps: - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From 30b3c2352e3cb807ad4bc9ab9ca7516745031d2e Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:50:59 -0700 Subject: [PATCH 05/13] rearrange some stuff --- .forgejo/build-service/action.yml | 1 - .forgejo/workflows/build-all.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/build-service/action.yml b/.forgejo/build-service/action.yml index 6d71e5c..7343534 100644 --- a/.forgejo/build-service/action.yml +++ b/.forgejo/build-service/action.yml @@ -5,7 +5,6 @@ inputs: runs: using: "composite" steps: - - uses: actions/checkout@v4 - run: | mkdir -pv artifacts cargo build --release --bin ${{ inputs.service-name }} diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index d834f16..11c072d 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -5,6 +5,7 @@ jobs: container: image: rust:1-bookworm steps: + - uses: actions/checkout@v4 - id: asklyphe-auth-frontend uses: ./.forgejo/build-service with: -- 2.39.5 From 1dc0a399a0be558b16b3cc426151d4b738b93826 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:52:56 -0700 Subject: [PATCH 06/13] change to v3 --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 11c072d..c221db4 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -5,7 +5,7 @@ jobs: container: image: rust:1-bookworm steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - id: asklyphe-auth-frontend uses: ./.forgejo/build-service with: -- 2.39.5 From d6509cccbe709f3be2244f446211c8f66e6f1909 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:56:09 -0700 Subject: [PATCH 07/13] changes in order for container to work --- .forgejo/workflows/build-all.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index c221db4..c13fe4e 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -5,6 +5,9 @@ jobs: container: image: rust:1-bookworm steps: + - run: | + apt-get upgrade + apt-get install node git - uses: actions/checkout@v3 - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From f3ee26f24b935ebfad8f34c141891413f34b18c1 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:56:32 -0700 Subject: [PATCH 08/13] nodejs, not node --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index c13fe4e..ab44461 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -7,7 +7,7 @@ jobs: steps: - run: | apt-get upgrade - apt-get install node git + apt-get install nodejs git - uses: actions/checkout@v3 - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From 9f87a327e052f3cdf32f452c8ec19a94575a220c Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:57:00 -0700 Subject: [PATCH 09/13] please --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index ab44461..537d2d4 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -6,7 +6,7 @@ jobs: image: rust:1-bookworm steps: - run: | - apt-get upgrade + apt-get update -qq apt-get install nodejs git - uses: actions/checkout@v3 - id: asklyphe-auth-frontend -- 2.39.5 From ce60a008683793cc82b1273ac988b22dcfcb20cb Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 20:57:28 -0700 Subject: [PATCH 10/13] oops --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 537d2d4..8c8a6dc 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -7,7 +7,7 @@ jobs: steps: - run: | apt-get update -qq - apt-get install nodejs git + apt-get install -y -qq nodejs git - uses: actions/checkout@v3 - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From 7de4cdc0d6ceb42acaa0124c799931057ad7ecf9 Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 21:00:34 -0700 Subject: [PATCH 11/13] install clang --- .forgejo/workflows/build-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 8c8a6dc..6945011 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -7,7 +7,7 @@ jobs: steps: - run: | apt-get update -qq - apt-get install -y -qq nodejs git + apt-get install -y -qq nodejs git clang - uses: actions/checkout@v3 - id: asklyphe-auth-frontend uses: ./.forgejo/build-service -- 2.39.5 From 1ad6dad9eb1e8555f8d0cd7f95ee5c0a04d0538e Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 21:09:35 -0700 Subject: [PATCH 12/13] fix foundationdb dependency --- .forgejo/workflows/build-all.yml | 4 - Cargo.lock | 349 ++++++++++++++++++++----------- asklyphe-common/src/lib.rs | 1 + vorebot/src/main.rs | 1 - 4 files changed, 223 insertions(+), 132 deletions(-) diff --git a/.forgejo/workflows/build-all.yml b/.forgejo/workflows/build-all.yml index 6945011..e2d3b19 100644 --- a/.forgejo/workflows/build-all.yml +++ b/.forgejo/workflows/build-all.yml @@ -33,10 +33,6 @@ jobs: uses: ./.forgejo/build-service with: service-name: "lyphedb" - - id: searchservice - uses: ./.forgejo/build-service - with: - service-name: "searchservice" - id: vorebot uses: ./.forgejo/build-service with: diff --git a/Cargo.lock b/Cargo.lock index 89154f8..0a3bdb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -184,7 +184,7 @@ checksum = "a41603f7cdbf5ac4af60760f17253eb6adf6ec5b6f14a7ed830cf687d375f163" dependencies = [ "askama", "axum-core", - "http 1.2.0", + "http 1.3.1", ] [[package]] @@ -200,7 +200,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -228,7 +228,7 @@ dependencies = [ "asklyphe-common", "async-nats", "axum", - "env_logger 0.11.6", + "env_logger 0.11.7", "futures", "rmp-serde", "serde", @@ -268,7 +268,7 @@ dependencies = [ "axum", "axum-extra", "chrono", - "env_logger 0.11.6", + "env_logger 0.11.7", "futures", "html-escape", "isahc", @@ -458,7 +458,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -507,7 +507,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -524,7 +524,7 @@ checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -581,7 +581,7 @@ dependencies = [ "axum-core", "bytes", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body", "http-body-util", "hyper", @@ -614,7 +614,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body", "http-body-util", "mime", @@ -638,7 +638,7 @@ dependencies = [ "cookie", "fastrand 2.3.0", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body", "http-body-util", "mime", @@ -679,9 +679,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "bb97d56060ee67d285efb8001fec9d2a4c710c32efd2e14b5cbb5ba71930fc2d" [[package]] name = "basic-toml" @@ -725,7 +725,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.99", + "syn 2.0.100", "which", ] @@ -830,7 +830,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -973,9 +973,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" dependencies = [ "clap_builder", "clap_derive", @@ -983,9 +983,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" dependencies = [ "anstream", "anstyle", @@ -995,14 +995,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1198,7 +1198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1255,7 +1255,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1278,7 +1278,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1289,7 +1289,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1327,7 +1327,7 @@ checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1350,7 +1350,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1413,9 +1413,9 @@ dependencies = [ [[package]] name = "email-encoding" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3d894bbbab314476b265f9b2d46bf24b123a36dd0e96b06a1b49545b9d9dcc" +checksum = "20b9cde6a71f9f758440470f3de16db6c09a02c443ce66850d87f5410548fb8e" dependencies = [ "base64 0.22.1", "memchr", @@ -1468,14 +1468,14 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" +checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] @@ -1673,7 +1673,7 @@ checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "try_map", ] @@ -1797,7 +1797,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -2071,7 +2071,7 @@ dependencies = [ "markup5ever", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -2087,9 +2087,9 @@ dependencies = [ [[package]] name = "http" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -2103,18 +2103,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.2.0", + "http 1.3.1", ] [[package]] name = "http-body-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", - "futures-util", - "http 1.2.0", + "futures-core", + "http 1.3.1", "http-body", "pin-project-lite", ] @@ -2142,9 +2142,9 @@ dependencies = [ [[package]] name = "humantime" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" [[package]] name = "hyper" @@ -2155,7 +2155,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body", "httparse", "httpdate", @@ -2173,7 +2173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", - "http 1.2.0", + "http 1.3.1", "hyper", "hyper-util", "rustls", @@ -2209,7 +2209,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body", "hyper", "pin-project-lite", @@ -2357,7 +2357,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -2407,9 +2407,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -2423,7 +2423,7 @@ checksum = "6c38228f24186d9cc68c729accb4d413be9eaed6ad07ff79e0270d9e56f3de13" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -2511,6 +2511,30 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jiff" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d699bc6dfc879fb1bf9bdff0d4c56f0884fc6f0d0eb0fba397a6d00cd9a6b85e" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d16e75759ee0aa64c57a56acbf43916987b20c77373cb7e808979e02b93c9f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + [[package]] name = "jpeg-decoder" version = "0.3.1" @@ -2576,9 +2600,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "lettre" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d476fe7a4a798f392ce34947aa7d53d981127e37523c5251da3c927f7fa901f" +checksum = "759bc2b8eabb6a30b235d6f716f7f36479f4b38cbe65b8747aefee51f89e8437" dependencies = [ "base64 0.22.1", "chumsky", @@ -2601,9 +2625,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.170" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libloading" @@ -2706,7 +2730,7 @@ version = "0.1.0" dependencies = [ "async-nats", "chrono", - "env_logger 0.11.6", + "env_logger 0.11.7", "futures", "log", "once_cell", @@ -2829,7 +2853,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.2.0", + "http 1.3.1", "httparse", "memchr", "mime", @@ -2997,9 +3021,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "cde51589ab56b20a6f686b2c68f7a0bd6add753d697abf720d63f8db3ab7b1ad" [[package]] name = "openssl" @@ -3024,7 +3048,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3075,7 +3099,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3229,7 +3253,7 @@ dependencies = [ "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3267,7 +3291,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3370,6 +3394,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3378,11 +3411,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.7.35", + "zerocopy 0.8.23", ] [[package]] @@ -3398,7 +3431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1ccf34da56fc294e7d4ccf69a85992b7dfb826b7cf57bac6a70bba3494cc08a" dependencies = [ "proc-macro2", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3429,7 +3462,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3449,7 +3482,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "version_check", "yansi", ] @@ -3502,7 +3535,7 @@ dependencies = [ "itertools 0.14.0", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -3606,9 +3639,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -3769,15 +3802,15 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" +checksum = "989e327e510263980e231de548a33e63d34962d29ae61b467389a1a09627a254" dependencies = [ "base64 0.22.1", "bytes", "futures-core", "futures-util", - "http 1.2.0", + "http 1.3.1", "http-body", "http-body-util", "hyper", @@ -3815,9 +3848,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", @@ -3880,9 +3913,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.7" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" dependencies = [ "const-oid", "digest", @@ -3956,9 +3989,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657" +checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825" dependencies = [ "bitflags 2.9.0", "errno", @@ -4088,7 +4121,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4147,7 +4180,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.99", + "syn 2.0.100", "unicode-ident", ] @@ -4210,7 +4243,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "thiserror 1.0.69", ] @@ -4234,7 +4267,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4325,9 +4358,9 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -4343,13 +4376,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4392,7 +4425,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4646,7 +4679,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4669,7 +4702,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.99", + "syn 2.0.100", "tempfile", "tokio", "url", @@ -4902,9 +4935,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.99" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -4928,7 +4961,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -4947,7 +4980,7 @@ dependencies = [ "fastrand 2.3.0", "getrandom 0.3.1", "once_cell", - "rustix 1.0.1", + "rustix 1.0.2", "windows-sys 0.59.0", ] @@ -5000,7 +5033,7 @@ dependencies = [ "cfg-if", "const_format", "futures-util", - "http 1.2.0", + "http 1.3.1", "indexmap", "paste", "reqwest", @@ -5023,7 +5056,7 @@ checksum = "5cf0ffc3ba4368e99597bd6afd83f4ff6febad66d9ae541ab46e697d32285fc0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5052,7 +5085,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5063,7 +5096,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5182,7 +5215,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5239,7 +5272,7 @@ dependencies = [ "bytes", "futures-core", "futures-sink", - "http 1.2.0", + "http 1.3.1", "httparse", "rand 0.8.5", "ring", @@ -5308,7 +5341,7 @@ checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ "bitflags 2.9.0", "bytes", - "http 1.2.0", + "http 1.3.1", "http-body", "http-body-util", "pin-project-lite", @@ -5348,7 +5381,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -5697,7 +5730,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "wasm-bindgen-shared", ] @@ -5732,7 +5765,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5861,32 +5894,31 @@ checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" [[package]] name = "windows-registry" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3" dependencies = [ "windows-result", "windows-strings", - "windows-targets 0.52.6", + "windows-targets 0.53.0", ] [[package]] name = "windows-result" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189" dependencies = [ - "windows-targets 0.52.6", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319" dependencies = [ - "windows-result", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -5940,13 +5972,29 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b" +dependencies = [ + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -5959,6 +6007,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -5971,6 +6025,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -5983,12 +6043,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -6001,6 +6073,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -6013,6 +6091,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -6025,6 +6109,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -6038,10 +6128,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.7.3" +name = "windows_x86_64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + +[[package]] +name = "winnow" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" dependencies = [ "memchr", ] @@ -6108,7 +6204,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "synstructure", ] @@ -6118,7 +6214,6 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "byteorder", "zerocopy-derive 0.7.35", ] @@ -6139,7 +6234,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -6150,7 +6245,7 @@ checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -6170,7 +6265,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "synstructure", ] @@ -6199,7 +6294,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] diff --git a/asklyphe-common/src/lib.rs b/asklyphe-common/src/lib.rs index 6a914b9..75d1758 100644 --- a/asklyphe-common/src/lib.rs +++ b/asklyphe-common/src/lib.rs @@ -12,6 +12,7 @@ */ pub mod nats; +#[cfg(feature = "foundationdb")] pub mod db; pub mod ldb; diff --git a/vorebot/src/main.rs b/vorebot/src/main.rs index 2c1db87..bcc1bbe 100644 --- a/vorebot/src/main.rs +++ b/vorebot/src/main.rs @@ -1,6 +1,5 @@ mod webparse; -use asklyphe_common::db; use asklyphe_common::nats::vorebot::{ VOREBOT_NEWHOSTNAME_SERVICE, VOREBOT_SERVICE, VOREBOT_SUGGESTED_SERVICE, }; -- 2.39.5 From 83053c57a8dfd75321c176192c242d5aafb45b8d Mon Sep 17 00:00:00 2001 From: husky Date: Wed, 12 Mar 2025 21:12:06 -0700 Subject: [PATCH 13/13] remove searchservice from workspace (old) --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7e6e755..c56cf91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,2 +1,2 @@ [workspace] -members = ["asklyphe-common", "asklyphe-frontend", "searchservice", "asklyphe-auth-frontend", "unit_converter", "authservice", "authservice/migration", "authservice/entity", "bingservice", "googleservice", "vorebot", "lyphedb", "lyphedb/ldbtesttool"] +members = ["asklyphe-common", "asklyphe-frontend", "asklyphe-auth-frontend", "unit_converter", "authservice", "authservice/migration", "authservice/entity", "bingservice", "googleservice", "vorebot", "lyphedb", "lyphedb/ldbtesttool"] -- 2.39.5