Skip to content

Commit

Permalink
Merge pull request #1364 from HTGAzureX1212/nightly
Browse files Browse the repository at this point in the history
Fix Dependencies
  • Loading branch information
HTGAzureX1212 authored Aug 23, 2023
2 parents 1e8af24 + d7e577b commit e3dc84a
Show file tree
Hide file tree
Showing 15 changed files with 33 additions and 18 deletions.
15 changes: 14 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion api-backend/hartex-backend-driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion api-backend/hartex-backend-models-v1/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion api-backend/hartex-backend-models/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
5 changes: 3 additions & 2 deletions bors/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bors/hartex-bors-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }

Expand Down
4 changes: 2 additions & 2 deletions bors/hartex-bors-database/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ 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"] }
serde = { version = "1.0.185", features = ["derive"] }
sqlx = { version = "0.7.0", features = ["runtime-tokio-native-tls", "sqlite"] }

[features]
2 changes: 1 addition & 1 deletion bors/hartex-bors-driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions bors/hartex-bors-github/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ 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 = { version = "1.0.185", features = ["derive"] }
serde_json = "1.0.105"
tokio = { version = "1.32.0", features = ["sync"] }

Expand Down
2 changes: 1 addition & 1 deletion bors/hartex-bors-website/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion buildsystem/hartexbuild-hartexfile/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ 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 {
#[allow(dead_code)]
pub struct MetadataMacroInput {
pub(self) command_type_ident: Ident,
pub(self) equal1: Token![=],
pub(self) command_type_lit: Lit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion discord-frontend/hartex-discord-worker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down

0 comments on commit e3dc84a

Please sign in to comment.