From d20f6d535af644dd0b598a792299b89c70abac58 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Wed, 23 Aug 2023 22:54:06 +0800 Subject: [PATCH 1/5] fix octocrab version --- bors/Cargo.lock | 5 +++-- bors/hartex-bors-core/Cargo.toml | 2 +- bors/hartex-bors-database/Cargo.toml | 2 +- bors/hartex-bors-driver/Cargo.toml | 2 +- bors/hartex-bors-github/Cargo.toml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bors/Cargo.lock b/bors/Cargo.lock index 4f1e9fd78..3c2dfdcd1 100644 --- a/bors/Cargo.lock +++ b/bors/Cargo.lock @@ -1748,8 +1748,9 @@ dependencies = [ [[package]] name = "octocrab" -version = "0.29.1" -source = "git+https://github.com/TeamHarTex/octocrab.git#1381b7ae4c26076d0b1220c82873dce98c91194a" +version = "0.29.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170c527fe1bf1d045e1f69a10dfd9b192327d53728b2c3481cf95b9dc2b42998" dependencies = [ "arc-swap", "async-trait", diff --git a/bors/hartex-bors-core/Cargo.toml b/bors/hartex-bors-core/Cargo.toml index 5ea7d198e..25a7c9d6c 100644 --- a/bors/hartex-bors-core/Cargo.toml +++ b/bors/hartex-bors-core/Cargo.toml @@ -12,7 +12,7 @@ rust-version = "1.73.0" [dependencies] miette = "5.10.0" -octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" } +octocrab = "0.29.3" sea-orm = { version = "0.12.2", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] } tokio = { version = "1.32.0", features = ["sync"] } diff --git a/bors/hartex-bors-database/Cargo.toml b/bors/hartex-bors-database/Cargo.toml index 9c76b6d24..8f6093c55 100644 --- a/bors/hartex-bors-database/Cargo.toml +++ b/bors/hartex-bors-database/Cargo.toml @@ -15,7 +15,7 @@ hartex_bors_core = { path = "../hartex-bors-core" } chrono = { version = "0.4.26", features = ["clock"], default-features = false } miette = "5.10.0" -octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" } +octocrab = "0.29.3" sea-orm = { version = "0.12.2", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] } sea-orm-migration = { version = "0.12.2", features = ["runtime-tokio-native-tls", "sqlx-sqlite"] } serde = { version = "=1.0.185", features = ["derive"] } diff --git a/bors/hartex-bors-driver/Cargo.toml b/bors/hartex-bors-driver/Cargo.toml index dcd1d35aa..7b5cc59d9 100644 --- a/bors/hartex-bors-driver/Cargo.toml +++ b/bors/hartex-bors-driver/Cargo.toml @@ -22,7 +22,7 @@ hartex_log = { path = "../../rust-utilities/hartex-log" } dotenvy = "0.15.7" futures-util = "0.3.28" miette = { version = "5.10.0", features = ["fancy"] } -octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" } +octocrab = "0.29.3" reqwest-eventsource = { git = "https://github.com/TeamHarTex/reqwest-eventsource.git" } serde_json = "1.0.105" state = "0.6.0" diff --git a/bors/hartex-bors-github/Cargo.toml b/bors/hartex-bors-github/Cargo.toml index bc75b97c5..593f1871c 100644 --- a/bors/hartex-bors-github/Cargo.toml +++ b/bors/hartex-bors-github/Cargo.toml @@ -22,7 +22,7 @@ http = "0.2.9" http-body = "0.4.5" jsonwebtoken = "8.3.0" miette = "5.10.0" -octocrab = { git = "https://github.com/TeamHarTex/octocrab.git" } +octocrab = "0.29.3" secrecy = "0.8.0" serde = { version = "=1.0.185", features = ["derive"] } serde_json = "1.0.105" From 6a678089ac4a9050269e84bde1c4a380b8f500fd Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Wed, 23 Aug 2023 22:54:59 +0800 Subject: [PATCH 2/5] unpin serde --- api-backend/hartex-backend-driver/Cargo.toml | 2 +- api-backend/hartex-backend-models-v1/Cargo.toml | 2 +- api-backend/hartex-backend-models/Cargo.toml | 2 +- bors/hartex-bors-database/Cargo.toml | 2 +- bors/hartex-bors-github/Cargo.toml | 2 +- bors/hartex-bors-website/Cargo.toml | 2 +- buildsystem/hartexbuild-hartexfile/Cargo.toml | 2 +- discord-frontend/hartex-discord-commands-manager/Cargo.toml | 2 +- .../hartex-discord-configuration-manifest/Cargo.toml | 2 +- discord-frontend/hartex-discord-worker/Cargo.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api-backend/hartex-backend-driver/Cargo.toml b/api-backend/hartex-backend-driver/Cargo.toml index 0540e975a..295ee05f4 100644 --- a/api-backend/hartex-backend-driver/Cargo.toml +++ b/api-backend/hartex-backend-driver/Cargo.toml @@ -21,7 +21,7 @@ hartex_log = { path = "../../rust-utilities/hartex-log" } dotenvy = "0.15.7" miette = { version = "5.10.0", features = ["fancy"] } rocket = { git = "https://github.com/SergioBenitez/Rocket.git", branch = "master" } -serde = "=1.0.185" +serde = "1.0.185" serde_json = "1.0.105" [features] diff --git a/api-backend/hartex-backend-models-v1/Cargo.toml b/api-backend/hartex-backend-models-v1/Cargo.toml index 6e96c4c0e..4b1884c51 100644 --- a/api-backend/hartex-backend-models-v1/Cargo.toml +++ b/api-backend/hartex-backend-models-v1/Cargo.toml @@ -11,7 +11,7 @@ rust-version = "1.73.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } sqlx = { version = "0.7.0", features = ["chrono", "postgres", "runtime-tokio-native-tls"] } [features] diff --git a/api-backend/hartex-backend-models/Cargo.toml b/api-backend/hartex-backend-models/Cargo.toml index 9c6f781bc..b1c1c43ce 100644 --- a/api-backend/hartex-backend-models/Cargo.toml +++ b/api-backend/hartex-backend-models/Cargo.toml @@ -11,6 +11,6 @@ rust-version = "1.73.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } [features] diff --git a/bors/hartex-bors-database/Cargo.toml b/bors/hartex-bors-database/Cargo.toml index 8f6093c55..86d5c8866 100644 --- a/bors/hartex-bors-database/Cargo.toml +++ b/bors/hartex-bors-database/Cargo.toml @@ -18,7 +18,7 @@ miette = "5.10.0" octocrab = "0.29.3" sea-orm = { version = "0.12.2", features = ["sqlx-sqlite", "runtime-tokio-native-tls", "macros"] } sea-orm-migration = { version = "0.12.2", features = ["runtime-tokio-native-tls", "sqlx-sqlite"] } -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } sqlx = { version = "0.7.0", features = ["runtime-tokio-native-tls", "sqlite"] } [features] diff --git a/bors/hartex-bors-github/Cargo.toml b/bors/hartex-bors-github/Cargo.toml index 593f1871c..b6ed6d1d5 100644 --- a/bors/hartex-bors-github/Cargo.toml +++ b/bors/hartex-bors-github/Cargo.toml @@ -24,7 +24,7 @@ jsonwebtoken = "8.3.0" miette = "5.10.0" octocrab = "0.29.3" secrecy = "0.8.0" -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } serde_json = "1.0.105" tokio = { version = "1.32.0", features = ["sync"] } diff --git a/bors/hartex-bors-website/Cargo.toml b/bors/hartex-bors-website/Cargo.toml index 8a314d2bd..7d0e10238 100644 --- a/bors/hartex-bors-website/Cargo.toml +++ b/bors/hartex-bors-website/Cargo.toml @@ -20,6 +20,6 @@ async-lock = "2.8.0" handlebars = { version = "5.0.0-beta.2", features = ["dir_source"] } miette = { version = "5.10.0", features = ["fancy"] } rocket = { git = "https://github.com/SergioBenitez/Rocket.git", branch = "master" } -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } [features] diff --git a/buildsystem/hartexbuild-hartexfile/Cargo.toml b/buildsystem/hartexbuild-hartexfile/Cargo.toml index 1b86dcc64..631616a9b 100644 --- a/buildsystem/hartexbuild-hartexfile/Cargo.toml +++ b/buildsystem/hartexbuild-hartexfile/Cargo.toml @@ -14,7 +14,7 @@ rust-version = "1.73.0" hartex_errors = { path = "../../rust-utilities/hartex-errors" } miette = "5.10.0" -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } hcl-rs = "0.16.3" [features] diff --git a/discord-frontend/hartex-discord-commands-manager/Cargo.toml b/discord-frontend/hartex-discord-commands-manager/Cargo.toml index a08318d41..7808d602c 100644 --- a/discord-frontend/hartex-discord-commands-manager/Cargo.toml +++ b/discord-frontend/hartex-discord-commands-manager/Cargo.toml @@ -20,7 +20,7 @@ hyper = { version = "0.14.27", features = ["client", "http2"] } hyper-trust-dns = { version = "0.5.0", features = ["native-tls"] } miette = { version = "5.10.0", features = ["fancy"] } owo-colors = "3.5.0" -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } serde_json = "1.0.105" walkdir = "2.3.3" diff --git a/discord-frontend/hartex-discord-configuration-manifest/Cargo.toml b/discord-frontend/hartex-discord-configuration-manifest/Cargo.toml index 0a609a277..c084295c8 100644 --- a/discord-frontend/hartex-discord-configuration-manifest/Cargo.toml +++ b/discord-frontend/hartex-discord-configuration-manifest/Cargo.toml @@ -13,6 +13,6 @@ rust-version = "1.73.0" [dependencies] hcl-rs = "0.16.3" miette = "5.10.0" -serde = { version = "=1.0.185", features = ["derive"] } +serde = { version = "1.0.185", features = ["derive"] } [features] diff --git a/discord-frontend/hartex-discord-worker/Cargo.toml b/discord-frontend/hartex-discord-worker/Cargo.toml index 2d983fa4c..1ddb22ec3 100644 --- a/discord-frontend/hartex-discord-worker/Cargo.toml +++ b/discord-frontend/hartex-discord-worker/Cargo.toml @@ -26,7 +26,7 @@ futures-util = "0.3.28" miette = { version = "5.10.0", features = ["fancy"] } once_cell = "1.18.0" rdkafka = { version = "0.33.2", default-features = false, features = ["cmake-build", "external-lz4", "tokio"] } -serde = "=1.0.185" +serde = "1.0.185" serde_json = "1.0.105" serde_scan = "0.4.1" sqlx = { version = "0.7.0", features = ["runtime-tokio-native-tls", "postgres"] } From a0e434c6d4b5395d9289420b4622de26812279a2 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Wed, 23 Aug 2023 22:59:11 +0800 Subject: [PATCH 3/5] changelog updates --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 979d8f352..9ce19aaad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,28 @@ # [Next Version](https://github.com/TeamHarTex/HarTex/compare/0.3.0...nightly) -> **x** contributors made contributions to this release +> **1** contributor made contributions to this release > **y** commits since 2022-08-31 ## API Backend +- **Changed:** unpinned `serde` + ## Bors Buildbot +- **Fixed:** fixed `octocrab` dependency +- **Changed:** unpinned `serde` + ## Buildsystem +- **Changed:** unpinned `serde` + ## Database Queries ## Discord Frontend +- **Changed:** pinned serde to version 1.0.185 + ## Localization Infrastructure ## Rust Utilities @@ -28,15 +37,18 @@ ## API Backend +- **Changed:** pinned serde to version 1.0.185 - **Fixed:** returning in the uptime route ## Bors Buildbot +- **Changed:** pinned serde to version 1.0.185 - **Changed:** migrated from eyre to miette for error reporting ## Buildsystem - **Changed:** migrated from eyre to miette for error reporting +- **Changed:** pinned serde to version 1.0.185 ## Discord Frontend @@ -46,6 +58,7 @@ - **Changed:** updated cache entities and repositories - **Changed:** replaced `/latency` and `/uptime` with `/info bot` - **Changed:** deprecated `CommandMetadata` derive macro +- **Changed:** pinned serde to version 1.0.185 ## Localization Infrastructure From 3bfbac1491284a2b7a8b2242db5cae0a3d55d757 Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Wed, 23 Aug 2023 23:03:14 +0800 Subject: [PATCH 4/5] whoops --- .../hartex-discord-commands-macros/src/commandmetadata.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs b/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs index 22aa91531..a3f4bd141 100644 --- a/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs +++ b/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs @@ -41,7 +41,7 @@ const LITERAL_PARAMETERS: [&str; 3] = ["command_type", "name", "minimum_level"]; const VALID_ATTR_PARAMETER_NAMES: [&str; 4] = ["command_type", "interaction_only", "name", "minimum_level"]; -pub(crate) struct MetadataMacroInput { +pub struct MetadataMacroInput { pub(self) command_type_ident: Ident, pub(self) equal1: Token![=], pub(self) command_type_lit: Lit, From d7e577b33e6a56fbb1dcb46e137251bdb59c4b2e Mon Sep 17 00:00:00 2001 From: HTGAzureX1212 <39023054+HTGAzureX1212@users.noreply.github.com> Date: Wed, 23 Aug 2023 23:03:49 +0800 Subject: [PATCH 5/5] allow dead code temp --- .../hartex-discord-commands-macros/src/commandmetadata.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs b/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs index a3f4bd141..cd0da3216 100644 --- a/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs +++ b/discord-frontend/hartex-discord-commands-macros/src/commandmetadata.rs @@ -41,6 +41,7 @@ const LITERAL_PARAMETERS: [&str; 3] = ["command_type", "name", "minimum_level"]; const VALID_ATTR_PARAMETER_NAMES: [&str; 4] = ["command_type", "interaction_only", "name", "minimum_level"]; +#[allow(dead_code)] pub struct MetadataMacroInput { pub(self) command_type_ident: Ident, pub(self) equal1: Token![=],