From a0f818e316c21d47b047f685ddaa160ec0ffa881 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Sun, 12 Jan 2025 23:19:15 +0800 Subject: [PATCH] update breaking changes --- database/Dockerfile | 9 +++++++++ discord-frontend/Cargo.lock | 4 ++-- .../hartex-discord-entitycache-macros/build.rs | 8 ++++---- docker/docker-compose.yml | 3 +++ 4 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 database/Dockerfile diff --git a/database/Dockerfile b/database/Dockerfile new file mode 100644 index 000000000..86f25bd0c --- /dev/null +++ b/database/Dockerfile @@ -0,0 +1,9 @@ +FROM rustlang/rust:nightly-bookworm-slim AS rust + +FROM rust as builder + +COPY . . +RUN apt-get update && apt-get install -y clang python3 python3-pip +RUN pip install cmake --break-system-packages + +RUN python3 ./x.py build -- database diff --git a/discord-frontend/Cargo.lock b/discord-frontend/Cargo.lock index 1c27a46de..f558082cb 100644 --- a/discord-frontend/Cargo.lock +++ b/discord-frontend/Cargo.lock @@ -622,9 +622,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" dependencies = [ "unicode-segmentation", ] diff --git a/discord-frontend/hartex-discord-entitycache-macros/build.rs b/discord-frontend/hartex-discord-entitycache-macros/build.rs index 86e462187..d9ac1bb3f 100644 --- a/discord-frontend/hartex-discord-entitycache-macros/build.rs +++ b/discord-frontend/hartex-discord-entitycache-macros/build.rs @@ -272,7 +272,7 @@ fn extract_archive(reader: R, output_dir: &Path) { fn generate_lazy_static_from_item_enum(item_enum: &ItemEnum) -> TokenStream { let ident = &item_enum.ident; - let const_name = ident.to_string().to_case(Case::ScreamingSnake); + let const_name = ident.to_string().to_case(Case::Constant); let const_ident = TokenStream::from_str(&const_name).unwrap(); let generic_params = item_enum @@ -304,7 +304,7 @@ fn generate_lazy_static_from_item_enum(item_enum: &ItemEnum) -> TokenStream { fn generate_lazy_static_from_item_struct(item_struct: &ItemStruct) -> TokenStream { let ident = &item_struct.ident; - let const_name = ident.to_string().to_case(Case::ScreamingSnake); + let const_name = ident.to_string().to_case(Case::Constant); let const_ident = TokenStream::from_str(&const_name).unwrap(); let generic_params = item_struct @@ -425,7 +425,7 @@ fn generate_enum_metadata_map(tree: &ModuleTree) -> TokenStream { let value_path_name = format!( "{}::{}", &path[16..(path.len() - (struct_name.len() + 2))], - struct_name.to_case(Case::ScreamingSnake), + struct_name.to_case(Case::Constant), ); let value_path: syn::Path = syn::parse_str(&value_path_name).unwrap(); @@ -459,7 +459,7 @@ fn generate_struct_metadata_map(tree: &ModuleTree) -> TokenStream { let value_path_name = format!( "{}::{}", &path[16..(path.len() - (struct_name.len() + 2))], - struct_name.to_case(Case::ScreamingSnake), + struct_name.to_case(Case::Constant), ); let value_path: syn::Path = syn::parse_str(&value_path_name).unwrap(); diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c1baff9a1..de3e5a60b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,10 +1,13 @@ services: api-backend: + container_name: api-1 build: dockerfile: api-backend/Dockerfile context: .. ports: - "3333:3333" + database: + container_name: db-1 proxy: image: twilightrs/http-proxy:metrics container_name: proxy-1