mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-12-23 11:21:32 +00:00
Merge branch 'main' of https://github.com/lemmynet/lemmy
This commit is contained in:
commit
a685e33f20
18 changed files with 117 additions and 108 deletions
18
.drone.yml
18
.drone.yml
|
|
@ -45,7 +45,7 @@ steps:
|
|||
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
|
||||
|
||||
- name: run federation tests
|
||||
image: node:15-alpine3.12
|
||||
image: node:alpine
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
|
||||
DO_WRITE_HOSTS_FILE: 1
|
||||
|
|
@ -122,11 +122,15 @@ steps:
|
|||
|
||||
# using https://github.com/pksunkara/cargo-workspaces
|
||||
- name: publish to crates.io
|
||||
image: rust:1.51-slim-buster
|
||||
image: rust:1
|
||||
environment:
|
||||
CARGO_TOKEN:
|
||||
from_secret: cargo_api_token
|
||||
commands:
|
||||
- cargo install cargo-workspaces
|
||||
- cp -r migrations crates/db_queries/
|
||||
- cargo workspaces publish --no-git-commit --allow-branch main --yes custom "${DRONE_TAG}"
|
||||
- cargo login "$CARGO_TOKEN"
|
||||
- cargo workspaces publish --from-git --allow-dirty --allow-branch "${DRONE_TAG}" --yes custom "${DRONE_TAG}"
|
||||
when:
|
||||
ref:
|
||||
- refs/tags/*
|
||||
|
|
@ -149,7 +153,7 @@ platform:
|
|||
steps:
|
||||
|
||||
- name: prepare repo
|
||||
image: rust:1.51-slim-buster
|
||||
image: rust:1-slim
|
||||
user: root
|
||||
commands:
|
||||
- chown 1000:1000 . -R
|
||||
|
|
@ -158,7 +162,7 @@ steps:
|
|||
- git fetch --tags
|
||||
|
||||
- name: cargo test
|
||||
image: rust:1.51-slim-buster
|
||||
image: rust:1-slim
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
|
||||
LEMMY_CONFIG_LOCATION: ../../config/config.hjson
|
||||
|
|
@ -172,7 +176,7 @@ steps:
|
|||
|
||||
# Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM.
|
||||
- name: cargo build
|
||||
image: rust:1.51-slim-buster
|
||||
image: rust:1-slim
|
||||
commands:
|
||||
- apt-get update
|
||||
- apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev
|
||||
|
|
@ -180,7 +184,7 @@ steps:
|
|||
- mv target/debug/lemmy_server target/lemmy_server
|
||||
|
||||
- name: run federation tests
|
||||
image: node:15-buster-slim
|
||||
image: node:16-slim
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
|
||||
DO_WRITE_HOSTS_FILE: 1
|
||||
|
|
|
|||
30
Cargo.lock
generated
30
Cargo.lock
generated
|
|
@ -1614,7 +1614,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"actix",
|
||||
"actix-rt",
|
||||
|
|
@ -1659,7 +1659,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api_common"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"actix-web",
|
||||
"chrono",
|
||||
|
|
@ -1678,7 +1678,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api_crud"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"actix",
|
||||
"actix-rt",
|
||||
|
|
@ -1722,7 +1722,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_apub"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"activitystreams",
|
||||
"actix",
|
||||
|
|
@ -1769,7 +1769,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_apub_lib"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"activitystreams",
|
||||
"anyhow",
|
||||
|
|
@ -1786,7 +1786,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_apub_lib_derive"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"proc-macro2 1.0.28",
|
||||
"quote 1.0.9",
|
||||
|
|
@ -1796,7 +1796,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_queries"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"bcrypt",
|
||||
"chrono",
|
||||
|
|
@ -1818,7 +1818,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_schema"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"diesel",
|
||||
|
|
@ -1831,7 +1831,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"diesel",
|
||||
"lemmy_db_queries",
|
||||
|
|
@ -1844,7 +1844,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views_actor"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"diesel",
|
||||
"lemmy_db_queries",
|
||||
|
|
@ -1854,7 +1854,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views_moderator"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"diesel",
|
||||
"lemmy_db_queries",
|
||||
|
|
@ -1864,7 +1864,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_routes"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"actix",
|
||||
"actix-web",
|
||||
|
|
@ -1892,7 +1892,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_server"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"activitystreams",
|
||||
"actix",
|
||||
|
|
@ -1930,7 +1930,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_utils"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"actix-rt",
|
||||
"actix-web",
|
||||
|
|
@ -1964,7 +1964,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_websocket"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
dependencies = [
|
||||
"actix",
|
||||
"actix-web",
|
||||
|
|
|
|||
26
Cargo.toml
26
Cargo.toml
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_server"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
homepage = "https://join-lemmy.org/"
|
||||
|
|
@ -32,18 +32,18 @@ members = [
|
|||
]
|
||||
|
||||
[dependencies]
|
||||
lemmy_api = { version = "=0.11.3", path = "./crates/api" }
|
||||
lemmy_api_crud = { version = "=0.11.3", path = "./crates/api_crud" }
|
||||
lemmy_apub = { version = "=0.11.3", path = "./crates/apub" }
|
||||
lemmy_utils = { version = "=0.11.3", path = "./crates/utils" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "./crates/db_schema" }
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "./crates/db_queries" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "./crates/db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.3", path = "./crates/db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "./crates/db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.3", path = "crates/api_common" }
|
||||
lemmy_websocket = { version = "=0.11.3", path = "./crates/websocket" }
|
||||
lemmy_routes = { version = "=0.11.3", path = "./crates/routes" }
|
||||
lemmy_api = { version = "=0.11.4-rc.28", path = "./crates/api" }
|
||||
lemmy_api_crud = { version = "=0.11.4-rc.28", path = "./crates/api_crud" }
|
||||
lemmy_apub = { version = "=0.11.4-rc.28", path = "./crates/apub" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "./crates/utils" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "./crates/db_schema" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "./crates/db_queries" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "./crates/db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "./crates/db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "./crates/db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.4-rc.28", path = "crates/api_common" }
|
||||
lemmy_websocket = { version = "=0.11.4-rc.28", path = "./crates/websocket" }
|
||||
lemmy_routes = { version = "=0.11.4-rc.28", path = "./crates/routes" }
|
||||
diesel = "1.4.7"
|
||||
diesel_migrations = "1.4.0"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_api"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -11,15 +11,15 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_apub = { version = "=0.11.3", path = "../apub" }
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "../db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
|
||||
lemmy_apub = { version = "=0.11.4-rc.28", path = "../apub" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "../db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
|
||||
diesel = "1.4.7"
|
||||
bcrypt = "0.10.1"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_api_common"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -11,12 +11,12 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "../db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "../db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
serde = { version = "1.0.127", features = ["derive"] }
|
||||
log = "0.4.14"
|
||||
diesel = "1.4.7"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
[package]
|
||||
name = "lemmy_api_crud"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
lemmy_apub = { version = "=0.11.3", path = "../apub" }
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "../db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
|
||||
lemmy_apub = { version = "=0.11.4-rc.28", path = "../apub" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
|
||||
lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "../db_views_moderator" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
|
||||
diesel = "1.4.7"
|
||||
bcrypt = "0.10.1"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_apub"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -11,14 +11,14 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_apub_lib = { version = "=0.11.3", path = "../apub_lib" }
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_apub_lib = { version = "=0.11.4-rc.28", path = "../apub_lib" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
|
||||
lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
|
||||
lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
|
||||
diesel = "1.4.7"
|
||||
activitystreams = "0.7.0-alpha.11"
|
||||
bcrypt = "0.10.1"
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
[package]
|
||||
name = "lemmy_apub_lib"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
||||
[dependencies]
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
|
||||
lemmy_apub_lib_derive = { version = "=0.11.3", path = "../apub_lib_derive" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
|
||||
lemmy_apub_lib_derive = { version = "=0.11.4-rc.28", path = "../apub_lib_derive" }
|
||||
activitystreams = "0.7.0-alpha.11"
|
||||
serde = { version = "1.0.127", features = ["derive"] }
|
||||
async-trait = "0.1.51"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_apub_lib_derive"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_db_queries"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -11,8 +11,8 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
diesel_migrations = "1.4.0"
|
||||
chrono = { version = "0.4.19", features = ["serde"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_db_schema"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_db_views"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -9,8 +9,8 @@ license = "AGPL-3.0"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.127", features = ["derive"] }
|
||||
log = "0.4.14"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_db_views_actor"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -9,7 +9,7 @@ license = "AGPL-3.0"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.127", features = ["derive"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_db_views_moderator"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -9,7 +9,7 @@ license = "AGPL-3.0"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
|
||||
serde = { version = "1.0.127", features = ["derive"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_routes"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -9,14 +9,14 @@ license = "AGPL-3.0"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_websocket = { version = "=0.11.3", path = "../websocket" }
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
|
||||
lemmy_apub_lib = { version = "=0.11.3", path = "../apub_lib" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
|
||||
lemmy_apub_lib = { version = "=0.11.4-rc.28", path = "../apub_lib" }
|
||||
diesel = "1.4.7"
|
||||
actix = "0.12.0"
|
||||
actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["rustls"] }
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_utils"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "lemmy_websocket"
|
||||
version = "0.11.3"
|
||||
version = "0.11.4-rc.28"
|
||||
edition = "2018"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -11,12 +11,12 @@ path = "src/lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
lemmy_utils = { version = "=0.11.3", path = "../utils" }
|
||||
lemmy_api_common = { version = "=0.11.3", path = "../api_common" }
|
||||
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.3", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" }
|
||||
lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
|
||||
lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
|
||||
lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
|
||||
lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
|
||||
lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
|
||||
reqwest = { version = "0.11.4", features = ["json"] }
|
||||
log = "0.4.14"
|
||||
rand = "0.8.4"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
#git checkout main
|
||||
|
||||
# Creating the new tag
|
||||
old_tag=$(cat "ansible/VERSION")
|
||||
new_tag="$1"
|
||||
third_semver=$(echo $new_tag | cut -d "." -f 3)
|
||||
|
||||
|
|
@ -21,6 +20,8 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
|
|||
fi
|
||||
|
||||
# Update crate versions for crates.io
|
||||
pushd ../../
|
||||
old_tag=$(head -3 Cargo.toml | tail -1 | cut -d'"' -f 2)
|
||||
for crate in crates/*; do
|
||||
pushd $crate
|
||||
# update version of the crate itself (only first occurence)
|
||||
|
|
@ -28,12 +29,16 @@ for crate in crates/*; do
|
|||
sed -i "0,/version = \"$old_tag\"/s//version = \"$new_tag\"/g" Cargo.toml
|
||||
# update version of lemmy dependencies
|
||||
sed -i "s/{ version = \"=$old_tag\", path/{ version = \"=$new_tag\", path/g" Cargo.toml
|
||||
git add Cargo.toml
|
||||
popd
|
||||
done
|
||||
# same as above, for the main cargo.toml
|
||||
sed -i "s/{ version = \"=$old_tag\", path/{ version = \"=$new_tag\", path/g" Cargo.toml
|
||||
sed -i "s/version = \"$old_tag\"/version = \"$new_tag\"/g" Cargo.toml
|
||||
|
||||
git add Cargo.toml
|
||||
cargo check
|
||||
git add Cargo.lock
|
||||
popd
|
||||
|
||||
# The commit
|
||||
git commit -m"Version $new_tag"
|
||||
|
|
|
|||
Loading…
Reference in a new issue