Skip to content

Commit

Permalink
Merge branch 'LemmyNet:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
kroese authored Jan 9, 2024
2 parents 4df92f4 + ea0b856 commit 328d4ed
Show file tree
Hide file tree
Showing 5 changed files with 288 additions and 401 deletions.
4 changes: 2 additions & 2 deletions .woodpecker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://github.com/woodpecker-ci/woodpecker/issues/1677

variables:
- &rust_image "rust:1.74.0"
- &rust_image "rust:1.75"
- &slow_check_paths
- path:
# rust source code
Expand Down Expand Up @@ -100,7 +100,7 @@ steps:
region: us-east-1
cache_key: "rust-cache"
path-style: true
backend_operation_timeout: 15m
backend_operation_timeout: 30m
compression_level: 0
exit_code: true
mount:
Expand Down
24 changes: 12 additions & 12 deletions Cargo.lock

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

24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace.package]
version = "0.19.2-rc.4"
version = "0.19.2-rc.5"
publish = false
edition = "2021"
description = "A link aggregator for the fediverse"
Expand Down Expand Up @@ -85,16 +85,16 @@ unused_self = "deny"
unwrap_used = "deny"

[workspace.dependencies]
lemmy_api = { version = "=0.19.2-rc.4", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.2-rc.4", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.2-rc.4", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.2-rc.4", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.19.2-rc.4", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.2-rc.4", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.2-rc.4", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.2-rc.4", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.2-rc.4", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.2-rc.4", path = "./crates/db_views_moderator" }
lemmy_api = { version = "=0.19.2-rc.5", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.2-rc.5", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.2-rc.5", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.2-rc.5", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.19.2-rc.5", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.2-rc.5", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.2-rc.5", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.2-rc.5", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.2-rc.5", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.2-rc.5", path = "./crates/db_views_moderator" }
activitypub_federation = { version = "0.5.1-beta.1", default-features = false, features = [
"actix-web",
] }
Expand Down Expand Up @@ -166,7 +166,7 @@ lemmy_utils = { workspace = true }
lemmy_db_schema = { workspace = true }
lemmy_api_common = { workspace = true }
lemmy_routes = { workspace = true }
lemmy_federate = { version = "0.19.2-rc.4", path = "crates/federate" }
lemmy_federate = { version = "0.19.2-rc.5", path = "crates/federate" }
activitypub_federation = { workspace = true }
diesel = { workspace = true }
diesel-async = { workspace = true }
Expand Down
Loading

0 comments on commit 328d4ed

Please sign in to comment.