Merge branch 'main' of https://github.com/lemmynet/lemmy

diff --git a/.drone.yml b/.drone.yml
index 7d75fcbd587ede565ddeb1c9500f9670a108baf3..697c9e814b0531f5c73b394a85f69adff41e2a52 100644 (file)
--- a/.drone.yml
+++ b/.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

diff --git a/Cargo.lock b/Cargo.lock
index 2d79489f8441f2602308db86a452a4d3d020b2fa..9f8aefe7c723087bb8f1ec7d903da12c361f28a5 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",

diff --git a/Cargo.toml b/Cargo.toml
index be1fd41287adebf2762d7dc111109dda212b04ee..c59d0d1a0de6f469d2c7768b6f1122ae4b8354f1 100644 (file)
--- a/Cargo.toml
+++ b/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"] }

diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
index f56b8f2e1c16e306da8b72e2e3b24aab75edb927..6a79f111a21e16921a124358db72ae29883e41af 100644 (file)
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -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"] }

diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml
index 05bbf97af3e85c93384a23764dde2f582cfa9e59..b4f5bbc29e621f846b45358bde9799590dd2a539 100644 (file)
--- a/crates/api_common/Cargo.toml
+++ b/crates/api_common/Cargo.toml
@@ -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"

diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml
index 563ae8d080ffe9fc95e8644cb6dff58585b11dbc..5b15598592daead3fd846fdc6287199df6426132 100644 (file)
--- a/crates/api_crud/Cargo.toml
+++ b/crates/api_crud/Cargo.toml
@@ -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"] }

diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml
index c8305e44f5616bbc52718aafcaf85ce4263c595e..9365e1ed1703f64c7f94000e65c3c179c830867a 100644 (file)
--- a/crates/apub/Cargo.toml
+++ b/crates/apub/Cargo.toml
@@ -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"

diff --git a/crates/apub_lib/Cargo.toml b/crates/apub_lib/Cargo.toml
index 7ea84c1f81533fbec6ad7cd91689c8948bbeafdf..53fa7ce43d4cf99ed6877c4fa9347981660564a3 100644 (file)
--- a/crates/apub_lib/Cargo.toml
+++ b/crates/apub_lib/Cargo.toml
@@ -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"

diff --git a/crates/apub_lib_derive/Cargo.toml b/crates/apub_lib_derive/Cargo.toml
index 5ad59840937a9be2e4c9fd200b1795579dca916e..5ac334e8dba05610d12973a71efa01b158a716f1 100644 (file)
--- a/crates/apub_lib_derive/Cargo.toml
+++ b/crates/apub_lib_derive/Cargo.toml
@@ -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"

diff --git a/crates/db_queries/Cargo.toml b/crates/db_queries/Cargo.toml
index 50199ea3e570bf6bc953158b78abe49d64feacd3..45bae7679c11db6dc43ff5c3b09e7ed77f909ab4 100644 (file)
--- a/crates/db_queries/Cargo.toml
+++ b/crates/db_queries/Cargo.toml
@@ -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"] }

diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml
index 969382b845bc363e578f09dc3501652e5eacd124..bc3cb02e170678a4b28c4613b7510c690fef2eeb 100644 (file)
--- a/crates/db_schema/Cargo.toml
+++ b/crates/db_schema/Cargo.toml
@@ -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"

diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml
index 7044b665988aff87150fba277d4359096d58c08e..735cf77a795b668dc4c144dc23aaf24b49bd4d0d 100644 (file)
--- a/crates/db_views/Cargo.toml
+++ b/crates/db_views/Cargo.toml
@@ -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"

diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml
index 14741e40802a4e6aac9eb066e917de82647376c5..dc758271428e2b60cb31be41b09c1fc7ed5bcf42 100644 (file)
--- a/crates/db_views_actor/Cargo.toml
+++ b/crates/db_views_actor/Cargo.toml
@@ -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"] }

diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml
index ba80dc0d45f905be6d0a996916a01498652387d8..d99b199411123a72760b2e4c7d5d1d13be353ed0 100644 (file)
--- a/crates/db_views_moderator/Cargo.toml
+++ b/crates/db_views_moderator/Cargo.toml
@@ -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"] }

diff --git a/crates/routes/Cargo.toml b/crates/routes/Cargo.toml
index 1ec729db993a1b09750f46cc967b0b6c299c1ce3..8862d16b4173de63e93fa478bd2699067d32b221 100644 (file)
--- a/crates/routes/Cargo.toml
+++ b/crates/routes/Cargo.toml
@@ -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"] }

diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index c46a4e0cff0889769781774b97a0b2e678004ec3..7e74c6189d0f1fb6a889ea42f7ad8b5e3a20fdee 100644 (file)
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -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"

diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml
index 0f5aa651d3cd22f2f8696d75fb18ab33f9b30fc0..d3b3a6d2c72cee27d009c7f9d45cdaf313de9e8c 100644 (file)
--- a/crates/websocket/Cargo.toml
+++ b/crates/websocket/Cargo.toml
@@ -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"

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 914e3bc403ddf6bd08123765937e42fc0f569122..2caea980ce81cdb54280411015ec98a3b61e7b5f 100755 (executable)
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -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"