From 6f1c715b8cb83762fe60c86af1a4b4bd3c86cfe1 Mon Sep 17 00:00:00 2001 From: izzy Date: Tue, 23 Sep 2025 12:02:35 -0500 Subject: [PATCH 1/4] chore: bump version to 0.8.9 --- Cargo.lock | 47 ++++++++++++------------------ crates/bonfire/Cargo.toml | 4 +-- crates/core/coalesced/Cargo.toml | 2 +- crates/core/config/Cargo.toml | 4 +-- crates/core/database/Cargo.toml | 14 ++++----- crates/core/files/Cargo.toml | 6 ++-- crates/core/models/Cargo.toml | 6 ++-- crates/core/parser/Cargo.toml | 2 +- crates/core/permissions/Cargo.toml | 4 +-- crates/core/presence/Cargo.toml | 4 +-- crates/core/ratelimits/Cargo.toml | 8 ++--- crates/core/result/Cargo.toml | 2 +- crates/daemons/crond/Cargo.toml | 10 +++---- crates/daemons/pushd/Cargo.toml | 12 ++++---- crates/delta/Cargo.toml | 2 +- crates/services/autumn/Cargo.toml | 12 ++++---- crates/services/gifbox/Cargo.toml | 14 ++++----- crates/services/january/Cargo.toml | 10 +++---- default.nix | 1 + 19 files changed, 78 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 01223df4..be9eef94 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4435,15 +4435,6 @@ dependencies = [ "hashbrown 0.15.5", ] -[[package]] -name = "lru" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe949189f46fabb938b3a9a0be30fdd93fd8a09260da863399a8cf3db756ec8" -dependencies = [ - "hashbrown 0.15.5", -] - [[package]] name = "lru-cache" version = "0.1.2" @@ -6284,7 +6275,7 @@ dependencies = [ [[package]] name = "revolt-autumn" -version = "0.8.8" +version = "0.8.9" dependencies = [ "axum", "axum-macros", @@ -6322,7 +6313,7 @@ dependencies = [ [[package]] name = "revolt-bonfire" -version = "0.8.8" +version = "0.8.9" dependencies = [ "async-channel 2.5.0", "async-std", @@ -6353,16 +6344,16 @@ dependencies = [ [[package]] name = "revolt-coalesced" -version = "0.8.8" +version = "0.8.9" dependencies = [ - "indexmap 2.11.1", - "lru 0.16.1", + "indexmap 1.9.3", + "lru 0.7.8", "tokio 1.47.1", ] [[package]] name = "revolt-config" -version = "0.8.8" +version = "0.8.9" dependencies = [ "async-std", "cached", @@ -6379,7 +6370,7 @@ dependencies = [ [[package]] name = "revolt-crond" -version = "0.8.8" +version = "0.8.9" dependencies = [ "log", "revolt-config", @@ -6391,7 +6382,7 @@ dependencies = [ [[package]] name = "revolt-database" -version = "0.8.8" +version = "0.8.9" dependencies = [ "amqprs", "async-lock 2.8.0", @@ -6438,7 +6429,7 @@ dependencies = [ [[package]] name = "revolt-delta" -version = "0.8.8" +version = "0.8.9" dependencies = [ "amqprs", "async-channel 1.9.0", @@ -6486,7 +6477,7 @@ dependencies = [ [[package]] name = "revolt-files" -version = "0.8.8" +version = "0.8.9" dependencies = [ "aes-gcm", "aws-config", @@ -6509,7 +6500,7 @@ dependencies = [ [[package]] name = "revolt-gifbox" -version = "0.8.8" +version = "0.8.9" dependencies = [ "axum", "axum-extra", @@ -6531,7 +6522,7 @@ dependencies = [ [[package]] name = "revolt-january" -version = "0.8.8" +version = "0.8.9" dependencies = [ "async-recursion", "axum", @@ -6559,7 +6550,7 @@ dependencies = [ [[package]] name = "revolt-models" -version = "0.8.8" +version = "0.8.9" dependencies = [ "indexmap 1.9.3", "iso8601-timestamp", @@ -6578,14 +6569,14 @@ dependencies = [ [[package]] name = "revolt-parser" -version = "0.8.8" +version = "0.8.9" dependencies = [ "logos", ] [[package]] name = "revolt-permissions" -version = "0.8.8" +version = "0.8.9" dependencies = [ "async-std", "async-trait", @@ -6600,7 +6591,7 @@ dependencies = [ [[package]] name = "revolt-presence" -version = "0.8.8" +version = "0.8.9" dependencies = [ "async-std", "log", @@ -6612,7 +6603,7 @@ dependencies = [ [[package]] name = "revolt-pushd" -version = "0.8.8" +version = "0.8.9" dependencies = [ "amqprs", "anyhow", @@ -6640,7 +6631,7 @@ dependencies = [ [[package]] name = "revolt-ratelimits" -version = "0.8.8" +version = "0.8.9" dependencies = [ "async-trait", "authifier", @@ -6657,7 +6648,7 @@ dependencies = [ [[package]] name = "revolt-result" -version = "0.8.8" +version = "0.8.9" dependencies = [ "axum", "revolt_okapi", diff --git a/crates/bonfire/Cargo.toml b/crates/bonfire/Cargo.toml index c0160270..1928fb46 100644 --- a/crates/bonfire/Cargo.toml +++ b/crates/bonfire/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-bonfire" -version = "0.8.8" +version = "0.8.9" license = "AGPL-3.0-or-later" edition = "2021" @@ -42,7 +42,7 @@ revolt-result = { path = "../core/result" } revolt-models = { path = "../core/models" } revolt-config = { path = "../core/config" } revolt-database = { path = "../core/database" } -revolt-permissions = { version = "0.8.8", path = "../core/permissions" } +revolt-permissions = { version = "0.8.9", path = "../core/permissions" } revolt-presence = { path = "../core/presence", features = ["redis-is-patched"] } # redis diff --git a/crates/core/coalesced/Cargo.toml b/crates/core/coalesced/Cargo.toml index cb23a8ad..32dad132 100644 --- a/crates/core/coalesced/Cargo.toml +++ b/crates/core/coalesced/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-coalesced" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "MIT" authors = ["Paul Makles ", "Zomatree "] diff --git a/crates/core/config/Cargo.toml b/crates/core/config/Cargo.toml index 26cc1c25..2a6dbb9e 100644 --- a/crates/core/config/Cargo.toml +++ b/crates/core/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-config" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "MIT" authors = ["Paul Makles "] @@ -37,4 +37,4 @@ sentry = { version = "0.31.5", optional = true } sentry-anyhow = { version = "0.38.1", optional = true } # Core -revolt-result = { version = "0.8.8", path = "../result", optional = true } +revolt-result = { version = "0.8.9", path = "../result", optional = true } diff --git a/crates/core/database/Cargo.toml b/crates/core/database/Cargo.toml index 02e55411..47095e3d 100644 --- a/crates/core/database/Cargo.toml +++ b/crates/core/database/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-database" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" authors = ["Paul Makles "] @@ -24,19 +24,19 @@ default = ["mongodb", "async-std-runtime", "tasks"] [dependencies] # Core -revolt-config = { version = "0.8.8", path = "../config", features = [ +revolt-config = { version = "0.8.9", path = "../config", features = [ "report-macros", ] } -revolt-result = { version = "0.8.8", path = "../result" } -revolt-models = { version = "0.8.8", path = "../models", features = [ +revolt-result = { version = "0.8.9", path = "../result" } +revolt-models = { version = "0.8.9", path = "../models", features = [ "validator", ] } -revolt-presence = { version = "0.8.8", path = "../presence" } -revolt-permissions = { version = "0.8.8", path = "../permissions", features = [ +revolt-presence = { version = "0.8.9", path = "../presence" } +revolt-permissions = { version = "0.8.9", path = "../permissions", features = [ "serde", "bson", ] } -revolt-parser = { version = "0.8.8", path = "../parser" } +revolt-parser = { version = "0.8.9", path = "../parser" } # Utility log = "0.4" diff --git a/crates/core/files/Cargo.toml b/crates/core/files/Cargo.toml index 7cc219f1..e6545192 100644 --- a/crates/core/files/Cargo.toml +++ b/crates/core/files/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-files" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" authors = ["Paul Makles "] @@ -20,10 +20,10 @@ typenum = "1.17.0" aws-config = "1.5.5" aws-sdk-s3 = { version = "1.46.0", features = ["behavior-version-latest"] } -revolt-config = { version = "0.8.8", path = "../config", features = [ +revolt-config = { version = "0.8.9", path = "../config", features = [ "report-macros", ] } -revolt-result = { version = "0.8.8", path = "../result" } +revolt-result = { version = "0.8.9", path = "../result" } # image processing jxl-oxide = "0.8.1" diff --git a/crates/core/models/Cargo.toml b/crates/core/models/Cargo.toml index e232fd6c..4821ec75 100644 --- a/crates/core/models/Cargo.toml +++ b/crates/core/models/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-models" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "MIT" authors = ["Paul Makles "] @@ -20,8 +20,8 @@ default = ["serde", "partials", "rocket"] [dependencies] # Core -revolt-config = { version = "0.8.8", path = "../config" } -revolt-permissions = { version = "0.8.8", path = "../permissions" } +revolt-config = { version = "0.8.9", path = "../config" } +revolt-permissions = { version = "0.8.9", path = "../permissions" } # Utility regex = "1.11" diff --git a/crates/core/parser/Cargo.toml b/crates/core/parser/Cargo.toml index a6e1869b..aa6b7fc2 100644 --- a/crates/core/parser/Cargo.toml +++ b/crates/core/parser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-parser" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "MIT" authors = ["Zomatree ", "Paul Makles "] diff --git a/crates/core/permissions/Cargo.toml b/crates/core/permissions/Cargo.toml index d5ee3216..6fcc3828 100644 --- a/crates/core/permissions/Cargo.toml +++ b/crates/core/permissions/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-permissions" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "MIT" authors = ["Paul Makles "] @@ -21,7 +21,7 @@ async-std = { version = "1.8.0", features = ["attributes"] } [dependencies] # Core -revolt-result = { version = "0.8.8", path = "../result" } +revolt-result = { version = "0.8.9", path = "../result" } # Utility auto_ops = "0.3.0" diff --git a/crates/core/presence/Cargo.toml b/crates/core/presence/Cargo.toml index 2e53c3e7..b2e23222 100644 --- a/crates/core/presence/Cargo.toml +++ b/crates/core/presence/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-presence" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" authors = ["Paul Makles "] @@ -16,7 +16,7 @@ redis-is-patched = [] async-std = { version = "1.8.0", features = ["attributes"] } # Config for loading Redis URI -revolt-config = { version = "0.8.8", path = "../config" } +revolt-config = { version = "0.8.9", path = "../config" } [dependencies] # Utility diff --git a/crates/core/ratelimits/Cargo.toml b/crates/core/ratelimits/Cargo.toml index 05e1e362..a41952bb 100644 --- a/crates/core/ratelimits/Cargo.toml +++ b/crates/core/ratelimits/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-ratelimits" -version = "0.8.8" +version = "0.8.9" edition = "2024" [features] @@ -10,9 +10,9 @@ axum = ["dep:axum", "revolt-database/axum-impl"] default = ["rocket", "axum"] [dependencies] -revolt-database = { version = "0.8.8", path = "../database"} -revolt-result = { version = "0.8.8", path = "../result" } -revolt-config = { version = "0.8.8", path = "../config" } +revolt-database = { version = "0.8.9", path = "../database"} +revolt-result = { version = "0.8.9", path = "../result" } +revolt-config = { version = "0.8.9", path = "../config" } rocket = { version = "0.5.1", optional = true } revolt_rocket_okapi = { version = "0.10.0", optional = true } diff --git a/crates/core/result/Cargo.toml b/crates/core/result/Cargo.toml index 3a25d206..b8ce0c59 100644 --- a/crates/core/result/Cargo.toml +++ b/crates/core/result/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-result" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "MIT" authors = ["Paul Makles "] diff --git a/crates/daemons/crond/Cargo.toml b/crates/daemons/crond/Cargo.toml index 2c55f2f7..1e070e38 100644 --- a/crates/daemons/crond/Cargo.toml +++ b/crates/daemons/crond/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-crond" -version = "0.8.8" +version = "0.8.9" license = "AGPL-3.0-or-later" authors = ["Paul Makles "] edition = "2021" @@ -16,7 +16,7 @@ log = "0.4" tokio = { version = "1" } # Core -revolt-database = { version = "0.8.8", path = "../../core/database" } -revolt-result = { version = "0.8.8", path = "../../core/result" } -revolt-config = { version = "0.8.8", path = "../../core/config" } -revolt-files = { version = "0.8.8", path = "../../core/files" } +revolt-database = { version = "0.8.9", path = "../../core/database" } +revolt-result = { version = "0.8.9", path = "../../core/result" } +revolt-config = { version = "0.8.9", path = "../../core/config" } +revolt-files = { version = "0.8.9", path = "../../core/files" } diff --git a/crates/daemons/pushd/Cargo.toml b/crates/daemons/pushd/Cargo.toml index 40a28008..71fc002b 100644 --- a/crates/daemons/pushd/Cargo.toml +++ b/crates/daemons/pushd/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "revolt-pushd" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" [dependencies] -revolt-result = { version = "0.8.8", path = "../../core/result" } -revolt-config = { version = "0.8.8", path = "../../core/config", features = [ +revolt-result = { version = "0.8.9", path = "../../core/result" } +revolt-config = { version = "0.8.9", path = "../../core/config", features = [ "report-macros", "anyhow" ] } -revolt-database = { version = "0.8.8", path = "../../core/database" } -revolt-models = { version = "0.8.8", path = "../../core/models", features = [ +revolt-database = { version = "0.8.9", path = "../../core/database" } +revolt-models = { version = "0.8.9", path = "../../core/models", features = [ "validator", ] } -revolt-presence = { version = "0.8.8", path = "../../core/presence", features = [ +revolt-presence = { version = "0.8.9", path = "../../core/presence", features = [ "redis-is-patched", ] } diff --git a/crates/delta/Cargo.toml b/crates/delta/Cargo.toml index 889b1167..fa4bc806 100644 --- a/crates/delta/Cargo.toml +++ b/crates/delta/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-delta" -version = "0.8.8" +version = "0.8.9" license = "AGPL-3.0-or-later" authors = ["Paul Makles "] edition = "2018" diff --git a/crates/services/autumn/Cargo.toml b/crates/services/autumn/Cargo.toml index 3514f501..e15fbf0e 100644 --- a/crates/services/autumn/Cargo.toml +++ b/crates/services/autumn/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-autumn" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" @@ -43,16 +43,16 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } # Core crates -revolt-files = { version = "0.8.8", path = "../../core/files" } -revolt-config = { version = "0.8.8", path = "../../core/config" } -revolt-database = { version = "0.8.8", path = "../../core/database", features = [ +revolt-files = { version = "0.8.9", path = "../../core/files" } +revolt-config = { version = "0.8.9", path = "../../core/config" } +revolt-database = { version = "0.8.9", path = "../../core/database", features = [ "axum-impl", ] } -revolt-result = { version = "0.8.8", path = "../../core/result", features = [ +revolt-result = { version = "0.8.9", path = "../../core/result", features = [ "utoipa", "axum", ] } -revolt-ratelimits = { version = "0.8.8", path = "../../core/ratelimits", features = ["axum"] } +revolt-ratelimits = { version = "0.8.9", path = "../../core/ratelimits", features = ["axum"] } # Axum / web server tempfile = "3.12.0" diff --git a/crates/services/gifbox/Cargo.toml b/crates/services/gifbox/Cargo.toml index 3e2b4173..c611f59d 100644 --- a/crates/services/gifbox/Cargo.toml +++ b/crates/services/gifbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-gifbox" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" @@ -16,19 +16,19 @@ tokio = { version = "1.0", features = ["full"] } reqwest = { version = "0.12", features = ["json"] } # Core crates -revolt-config = { version = "0.8.8", path = "../../core/config" } -revolt-models = { version = "0.8.8", path = "../../core/models" } -revolt-result = { version = "0.8.8", path = "../../core/result", features = [ +revolt-config = { version = "0.8.9", path = "../../core/config" } +revolt-models = { version = "0.8.9", path = "../../core/models" } +revolt-result = { version = "0.8.9", path = "../../core/result", features = [ "utoipa", "axum", ] } -revolt-coalesced = { version = "0.8.8", path = "../../core/coalesced", features = [ +revolt-coalesced = { version = "0.8.9", path = "../../core/coalesced", features = [ "queue", ] } -revolt-database = { version = "0.8.8", path = "../../core/database", features = [ +revolt-database = { version = "0.8.9", path = "../../core/database", features = [ "axum-impl", ] } -revolt-ratelimits = { version = "0.8.8", path = "../../core/ratelimits", features = [ +revolt-ratelimits = { version = "0.8.9", path = "../../core/ratelimits", features = [ "axum", ] } diff --git a/crates/services/january/Cargo.toml b/crates/services/january/Cargo.toml index 80b5e522..b549882a 100644 --- a/crates/services/january/Cargo.toml +++ b/crates/services/january/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "revolt-january" -version = "0.8.8" +version = "0.8.9" edition = "2021" license = "AGPL-3.0-or-later" @@ -32,13 +32,13 @@ tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } # Core crates -revolt-config = { version = "0.8.8", path = "../../core/config" } -revolt-models = { version = "0.8.8", path = "../../core/models" } -revolt-result = { version = "0.8.8", path = "../../core/result", features = [ +revolt-config = { version = "0.8.9", path = "../../core/config" } +revolt-models = { version = "0.8.9", path = "../../core/models" } +revolt-result = { version = "0.8.9", path = "../../core/result", features = [ "utoipa", "axum", ] } -revolt-files = { version = "0.8.8", path = "../../core/files" } +revolt-files = { version = "0.8.9", path = "../../core/files" } # Axum / web server axum = { version = "0.7.5" } diff --git a/default.nix b/default.nix index dad66fc2..06d2e319 100644 --- a/default.nix +++ b/default.nix @@ -11,6 +11,7 @@ pkgs.mkShell rec { # Cargo pkgs.cargo pkgs.cargo-nextest + pkgs.cargo-release # Rust pkgs.rustc From f0a83abcfafaf9062635bc866a17e73d4a38dd70 Mon Sep 17 00:00:00 2001 From: izzy Date: Tue, 23 Sep 2025 12:09:19 -0500 Subject: [PATCH 2/4] ci: add missing src copies for Docker build --- Dockerfile | 2 ++ Dockerfile.useCurrentArch | 2 ++ scripts/build-image-layer.sh | 7 +++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 524e7e0e..9ea6ea89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,8 @@ COPY crates/core/parser/Cargo.toml ./crates/core/parser/ COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/ COPY crates/core/presence/Cargo.toml ./crates/core/presence/ COPY crates/core/result/Cargo.toml ./crates/core/result/ +COPY crates/core/coalesced/Cargo.toml ./crates/core/coalesced/ +COPY crates/core/ratelimits/Cargo.toml ./crates/core/ratelimits/ COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/ COPY crates/services/january/Cargo.toml ./crates/services/january/ COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/ diff --git a/Dockerfile.useCurrentArch b/Dockerfile.useCurrentArch index f36c0808..c8a8bb14 100644 --- a/Dockerfile.useCurrentArch +++ b/Dockerfile.useCurrentArch @@ -23,6 +23,8 @@ COPY crates/core/parser/Cargo.toml ./crates/core/parser/ COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/ COPY crates/core/presence/Cargo.toml ./crates/core/presence/ COPY crates/core/result/Cargo.toml ./crates/core/result/ +COPY crates/core/coalesced/Cargo.toml ./crates/core/coalesced/ +COPY crates/core/ratelimits/Cargo.toml ./crates/core/ratelimits/ COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/ COPY crates/services/january/Cargo.toml ./crates/services/january/ COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/ diff --git a/scripts/build-image-layer.sh b/scripts/build-image-layer.sh index 064cee89..613cd32d 100644 --- a/scripts/build-image-layer.sh +++ b/scripts/build-image-layer.sh @@ -33,6 +33,7 @@ deps() { crates/core/presence/src \ crates/core/result/src \ crates/core/coalesced/src \ + crates/core/ratelimits/src \ crates/services/autumn/src \ crates/services/january/src \ crates/services/gifbox/src \ @@ -55,7 +56,8 @@ deps() { tee crates/core/permissions/src/lib.rs | tee crates/core/presence/src/lib.rs | tee crates/core/result/src/lib.rs | - tee crates/core/coalesced/src/lib.rs + tee crates/core/coalesced/src/lib.rs | + tee crates/core/ratelimits/src/lib.rs if [ -z "$TARGETARCH" ]; then cargo build -j 10 --locked --release @@ -77,7 +79,8 @@ apps() { crates/core/permissions/src/lib.rs \ crates/core/presence/src/lib.rs \ crates/core/result/src/lib.rs \ - crates/core/coalesced/src/lib .rs + crates/core/coalesced/src/lib.rs \ + crates/core/ratelimits/src/lib.rs if [ -z "$TARGETARCH" ]; then cargo build -j 10 --locked --release From 4fb99e3bd0ccc9bce35070140066edbd38a372b2 Mon Sep 17 00:00:00 2001 From: izzy Date: Tue, 23 Sep 2025 12:12:33 -0500 Subject: [PATCH 3/4] ci: also include gifbox src --- Dockerfile | 1 + Dockerfile.useCurrentArch | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9ea6ea89..7c9a1e44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,7 @@ COPY crates/core/coalesced/Cargo.toml ./crates/core/coalesced/ COPY crates/core/ratelimits/Cargo.toml ./crates/core/ratelimits/ COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/ COPY crates/services/january/Cargo.toml ./crates/services/january/ +COPY crates/services/gifbox/Cargo.toml ./crates/services/gifbox/ COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/ COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/ RUN sh /tmp/build-image-layer.sh deps diff --git a/Dockerfile.useCurrentArch b/Dockerfile.useCurrentArch index c8a8bb14..ac9a438f 100644 --- a/Dockerfile.useCurrentArch +++ b/Dockerfile.useCurrentArch @@ -27,6 +27,7 @@ COPY crates/core/coalesced/Cargo.toml ./crates/core/coalesced/ COPY crates/core/ratelimits/Cargo.toml ./crates/core/ratelimits/ COPY crates/services/autumn/Cargo.toml ./crates/services/autumn/ COPY crates/services/january/Cargo.toml ./crates/services/january/ +COPY crates/services/gifbox/Cargo.toml ./crates/services/gifbox/ COPY crates/daemons/crond/Cargo.toml ./crates/daemons/crond/ COPY crates/daemons/pushd/Cargo.toml ./crates/daemons/pushd/ RUN sh /tmp/build-image-layer.sh deps From d65c1a1ab3bdc7e5684b03f280af77d881661a3d Mon Sep 17 00:00:00 2001 From: Zomatree Date: Sat, 11 Oct 2025 23:01:35 +0100 Subject: [PATCH 4/4] fix(ci): publish images under stoatchat and remove docker hub --- .github/workflows/docker.yaml | 42 ++++++++++++----------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index f0a79f53..5a63353a 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -49,13 +49,6 @@ jobs: uses: docker/setup-buildx-action@v2 # Authenticate with Docker Hub and GHCR - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - registry: docker.io - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to Github Container Registry uses: docker/login-action@v2 with: @@ -72,14 +65,13 @@ jobs: platforms: linux/amd64,linux/arm64 tags: ghcr.io/${{ github.repository_owner }}/base:latest - # revoltchat/server + # stoatchat/api - name: Docker meta id: meta-delta uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/server - ghcr.io/revoltchat/server + ghcr.io/stoatchat/api - name: Publish uses: docker/build-push-action@v4 with: @@ -92,14 +84,13 @@ jobs: BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest labels: ${{ steps.meta-delta.outputs.labels }} - # revoltchat/bonfire + # stoatchat/events - name: Docker meta id: meta-bonfire uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/bonfire - ghcr.io/revoltchat/bonfire + ghcr.io/stoatchat/events - name: Publish uses: docker/build-push-action@v4 with: @@ -112,14 +103,13 @@ jobs: BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest labels: ${{ steps.meta-bonfire.outputs.labels }} - # revoltchat/autumn + # stoatchat/file-server - name: Docker meta id: meta-autumn uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/autumn - ghcr.io/revoltchat/autumn + ghcr.io/stoatchat/file-server - name: Publish uses: docker/build-push-action@v4 with: @@ -132,14 +122,13 @@ jobs: BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest labels: ${{ steps.meta-autumn.outputs.labels }} - # revoltchat/january + # stoatchat/proxy - name: Docker meta id: meta-january uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/january - ghcr.io/revoltchat/january + ghcr.io/stoatchat/proxy - name: Publish uses: docker/build-push-action@v4 with: @@ -152,14 +141,13 @@ jobs: BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest labels: ${{ steps.meta-january.outputs.labels }} - # revoltchat/gifbox + # stoatchat/gifbox - name: Docker meta id: meta-gifbox uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/gifbox - ghcr.io/revoltchat/gifbox + ghcr.io/stoatchat/gifbox - name: Publish uses: docker/build-push-action@v4 with: @@ -172,14 +160,13 @@ jobs: BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest labels: ${{ steps.meta-gifbox.outputs.labels }} - # revoltchat/crond + # stoatchat/crond - name: Docker meta id: meta-crond uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/crond - ghcr.io/revoltchat/crond + ghcr.io/stoatchat/crond - name: Publish uses: docker/build-push-action@v4 with: @@ -192,14 +179,13 @@ jobs: BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest labels: ${{ steps.meta-crond.outputs.labels }} - # revoltchat/pushd + # stoatchat/pushd - name: Docker meta id: meta-pushd uses: docker/metadata-action@v4 with: images: | - docker.io/revoltchat/pushd - ghcr.io/revoltchat/pushd + ghcr.io/stoatchat/pushd - name: Publish uses: docker/build-push-action@v4 with: