From af225a42d0863a4362967b8e035e5b1a4643b725 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 25 Aug 2021 17:26:10 -0400 Subject: [PATCH] Fix prod deploy script and clippy (#1724) * Updating lemmy-js-client. * Fix prod deploy script and clippy * Try using buster. * Using more generic and updated images. * again. * again. * Try alternate env * again. * again. * Version 0.11.4-rc.24 * again. * Better old_tag * Version 0.11.4-rc.27 * Updating cargo.lock * Trying to run a cargo check to update the lock * Version 0.11.4-rc.28 --- .drone.yml | 18 ++++++++++------- Cargo.lock | 30 ++++++++++++++-------------- Cargo.toml | 26 ++++++++++++------------ api_tests/package.json | 2 +- api_tests/yarn.lock | 8 ++++---- crates/api/Cargo.toml | 20 +++++++++---------- crates/api_common/Cargo.toml | 14 ++++++------- crates/api_crud/Cargo.toml | 20 +++++++++---------- crates/apub/Cargo.toml | 18 ++++++++--------- crates/apub_lib/Cargo.toml | 8 ++++---- crates/apub_lib_derive/Cargo.toml | 2 +- crates/db_queries/Cargo.toml | 6 +++--- crates/db_schema/Cargo.toml | 2 +- crates/db_views/Cargo.toml | 6 +++--- crates/db_views_actor/Cargo.toml | 6 +++--- crates/db_views_moderator/Cargo.toml | 6 +++--- crates/routes/Cargo.toml | 18 ++++++++--------- crates/utils/Cargo.toml | 2 +- crates/websocket/Cargo.toml | 14 ++++++------- docker/prod/deploy.sh | 9 +++++++-- 20 files changed, 122 insertions(+), 113 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7d75fcbd..697c9e81 100644 --- 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 2d79489f..9f8aefe7 100644 --- 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 be1fd412..c59d0d1a 100644 --- 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/api_tests/package.json b/api_tests/package.json index 33bb3e0b..1c5ed657 100644 --- a/api_tests/package.json +++ b/api_tests/package.json @@ -16,7 +16,7 @@ "eslint": "^7.30.0", "eslint-plugin-jane": "^9.0.3", "jest": "^27.0.6", - "lemmy-js-client": "0.11.4-rc.14", + "lemmy-js-client": "0.12.0-rc.1", "node-fetch": "^2.6.1", "prettier": "^2.3.2", "ts-jest": "^27.0.3", diff --git a/api_tests/yarn.lock b/api_tests/yarn.lock index e148c0fd..4d3e51c8 100644 --- a/api_tests/yarn.lock +++ b/api_tests/yarn.lock @@ -3076,10 +3076,10 @@ language-tags@^1.0.5: dependencies: language-subtag-registry "~0.3.2" -lemmy-js-client@0.11.4-rc.14: - version "0.11.4-rc.14" - resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.11.4-rc.14.tgz#dcac5b8dc78c3b04e6b3630ff9351a94aa73e109" - integrity sha512-R8M+myyriNQljQlTweVqtUKGBpgmaM7RI4ebYb7N7sYr5Bk5Ip6v2qTNvKAV6BlsDOCTWANOonfeoz/cIerLEg== +lemmy-js-client@0.12.0-rc.1: + version "0.12.0-rc.1" + resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.12.0-rc.1.tgz#8e9e44dfe7756eb303af3395d8fc4597178a2e73" + integrity sha512-vSr0+xvG5DkC3ZUtOCnsXeG4p3m9OWPq96ZwhMAsyMh5w/dkDX7ZVdslFpflp/DBE6L8xELa9so0Crg7cwCSZg== leven@^3.1.0: version "3.1.0" diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index f56b8f2e..6a79f111 100644 --- 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 05bbf97a..b4f5bbc2 100644 --- 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 563ae8d0..5b155985 100644 --- 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 c8305e44..9365e1ed 100644 --- 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 7ea84c1f..53fa7ce4 100644 --- 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 5ad59840..5ac334e8 100644 --- 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 50199ea3..45bae767 100644 --- 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 969382b8..bc3cb02e 100644 --- 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 7044b665..735cf77a 100644 --- 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 14741e40..dc758271 100644 --- 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 ba80dc0d..d99b1994 100644 --- 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 1ec729db..8862d16b 100644 --- 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 c46a4e0c..7e74c618 100644 --- 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 0f5aa651..d3b3a6d2 100644 --- 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 914e3bc4..2caea980 100755 --- 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" -- 2.44.1