fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-25 15:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix prod deploy script and clippy (#1724)

Browse source 
* 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
This commit is contained in:
Dessalines 2021-08-25 17:26:10 -04:00 committed by GitHub
parent 73449c09a7
commit af225a42d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 122 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.drone.yml
View file

@ -45,7 +45,7 @@ steps:
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
- name: run federation tests - name: run federation tests
image: node:15-alpine3.12 image: node:alpine
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432 LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
DO_WRITE_HOSTS_FILE: 1 DO_WRITE_HOSTS_FILE: 1
@ -122,11 +122,15 @@ steps:
# using https://github.com/pksunkara/cargo-workspaces # using https://github.com/pksunkara/cargo-workspaces
- name: publish to crates.io - name: publish to crates.io
image: rust:1.51-slim-buster image: rust:1
environment:
CARGO_TOKEN:
from_secret: cargo_api_token
commands: commands:
- cargo install cargo-workspaces - cargo install cargo-workspaces
- cp -r migrations crates/db_queries/ - 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: when:
ref: ref:
- refs/tags/* - refs/tags/*
@ -149,7 +153,7 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: rust:1.51-slim-buster image: rust:1-slim
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -158,7 +162,7 @@ steps:
- git fetch --tags - git fetch --tags
- name: cargo test - name: cargo test
image: rust:1.51-slim-buster image: rust:1-slim
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
LEMMY_CONFIG_LOCATION: ../../config/config.hjson 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. # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM.
- name: cargo build - name: cargo build
image: rust:1.51-slim-buster image: rust:1-slim
commands: commands:
- apt-get update - apt-get update
- apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev - 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 - mv target/debug/lemmy_server target/lemmy_server
- name: run federation tests - name: run federation tests
image: node:15-buster-slim image: node:16-slim
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432 LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432
DO_WRITE_HOSTS_FILE: 1 DO_WRITE_HOSTS_FILE: 1

30
Cargo.lock generated
View file

@ -1614,7 +1614,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "lemmy_api" name = "lemmy_api"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"actix", "actix",
"actix-rt", "actix-rt",
@ -1659,7 +1659,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_api_common" name = "lemmy_api_common"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"chrono", "chrono",
@ -1678,7 +1678,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_api_crud" name = "lemmy_api_crud"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"actix", "actix",
"actix-rt", "actix-rt",
@ -1722,7 +1722,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_apub" name = "lemmy_apub"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"activitystreams", "activitystreams",
"actix", "actix",
@ -1769,7 +1769,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_apub_lib" name = "lemmy_apub_lib"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"activitystreams", "activitystreams",
"anyhow", "anyhow",
@ -1786,7 +1786,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_apub_lib_derive" name = "lemmy_apub_lib_derive"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"proc-macro2 1.0.28", "proc-macro2 1.0.28",
"quote 1.0.9", "quote 1.0.9",
@ -1796,7 +1796,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_queries" name = "lemmy_db_queries"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"bcrypt", "bcrypt",
"chrono", "chrono",
@ -1818,7 +1818,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_schema" name = "lemmy_db_schema"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"chrono", "chrono",
"diesel", "diesel",
@ -1831,7 +1831,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views" name = "lemmy_db_views"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"diesel", "diesel",
"lemmy_db_queries", "lemmy_db_queries",
@ -1844,7 +1844,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views_actor" name = "lemmy_db_views_actor"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"diesel", "diesel",
"lemmy_db_queries", "lemmy_db_queries",
@ -1854,7 +1854,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views_moderator" name = "lemmy_db_views_moderator"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"diesel", "diesel",
"lemmy_db_queries", "lemmy_db_queries",
@ -1864,7 +1864,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_routes" name = "lemmy_routes"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"actix", "actix",
"actix-web", "actix-web",
@ -1892,7 +1892,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_server" name = "lemmy_server"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"activitystreams", "activitystreams",
"actix", "actix",
@ -1930,7 +1930,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_utils" name = "lemmy_utils"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"actix-rt", "actix-rt",
"actix-web", "actix-web",
@ -1964,7 +1964,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_websocket" name = "lemmy_websocket"
version = "0.11.3" version = "0.11.4-rc.28"
dependencies = [ dependencies = [
"actix", "actix",
"actix-web", "actix-web",

26
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_server" name = "lemmy_server"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
@ -32,18 +32,18 @@ members = [
] ]
[dependencies] [dependencies]
lemmy_api = { version = "=0.11.3", path = "./crates/api" } lemmy_api = { version = "=0.11.4-rc.28", path = "./crates/api" }
lemmy_api_crud = { version = "=0.11.3", path = "./crates/api_crud" } lemmy_api_crud = { version = "=0.11.4-rc.28", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.11.3", path = "./crates/apub" } lemmy_apub = { version = "=0.11.4-rc.28", path = "./crates/apub" }
lemmy_utils = { version = "=0.11.3", path = "./crates/utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.11.3", path = "./crates/db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "./crates/db_schema" }
lemmy_db_queries = { version = "=0.11.3", path = "./crates/db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "./crates/db_queries" }
lemmy_db_views = { version = "=0.11.3", path = "./crates/db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "./crates/db_views" }
lemmy_db_views_moderator = { version = "=0.11.3", path = "./crates/db_views_moderator" } lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "./crates/db_views_moderator" }
lemmy_db_views_actor = { version = "=0.11.3", path = "./crates/db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "./crates/db_views_actor" }
lemmy_api_common = { version = "=0.11.3", path = "crates/api_common" } lemmy_api_common = { version = "=0.11.4-rc.28", path = "crates/api_common" }
lemmy_websocket = { version = "=0.11.3", path = "./crates/websocket" } lemmy_websocket = { version = "=0.11.4-rc.28", path = "./crates/websocket" }
lemmy_routes = { version = "=0.11.3", path = "./crates/routes" } lemmy_routes = { version = "=0.11.4-rc.28", path = "./crates/routes" }
diesel = "1.4.7" diesel = "1.4.7"
diesel_migrations = "1.4.0" diesel_migrations = "1.4.0"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }

2
api_tests/package.json
View file

@ -16,7 +16,7 @@
"eslint": "^7.30.0", "eslint": "^7.30.0",
"eslint-plugin-jane": "^9.0.3", "eslint-plugin-jane": "^9.0.3",
"jest": "^27.0.6", "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", "node-fetch": "^2.6.1",
"prettier": "^2.3.2", "prettier": "^2.3.2",
"ts-jest": "^27.0.3", "ts-jest": "^27.0.3",

8
api_tests/yarn.lock
View file

@ -3076,10 +3076,10 @@ language-tags@^1.0.5:
dependencies: dependencies:
language-subtag-registry "~0.3.2" language-subtag-registry "~0.3.2"
lemmy-js-client@0.11.4-rc.14: lemmy-js-client@0.12.0-rc.1:
version "0.11.4-rc.14" version "0.12.0-rc.1"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.11.4-rc.14.tgz#dcac5b8dc78c3b04e6b3630ff9351a94aa73e109" resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.12.0-rc.1.tgz#8e9e44dfe7756eb303af3395d8fc4597178a2e73"
integrity sha512-R8M+myyriNQljQlTweVqtUKGBpgmaM7RI4ebYb7N7sYr5Bk5Ip6v2qTNvKAV6BlsDOCTWANOonfeoz/cIerLEg== integrity sha512-vSr0+xvG5DkC3ZUtOCnsXeG4p3m9OWPq96ZwhMAsyMh5w/dkDX7ZVdslFpflp/DBE6L8xELa9so0Crg7cwCSZg==
leven@^3.1.0: leven@^3.1.0:
version "3.1.0" version "3.1.0"

20
crates/api/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_api" name = "lemmy_api"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -11,15 +11,15 @@ path = "src/lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_apub = { version = "=0.11.3", path = "../apub" } lemmy_apub = { version = "=0.11.4-rc.28", path = "../apub" }
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
lemmy_db_views = { version = "=0.11.3", path = "../db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator" } lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" } lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" } lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
diesel = "1.4.7" diesel = "1.4.7"
bcrypt = "0.10.1" bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }

14
crates/api_common/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_api_common" name = "lemmy_api_common"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -11,12 +11,12 @@ path = "src/lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_views = { version = "=0.11.3", path = "../db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator" } lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
serde = { version = "1.0.127", features = ["derive"] } serde = { version = "1.0.127", features = ["derive"] }
log = "0.4.14" log = "0.4.14"
diesel = "1.4.7" diesel = "1.4.7"

20
crates/api_crud/Cargo.toml
View file

@ -1,20 +1,20 @@
[package] [package]
name = "lemmy_api_crud" name = "lemmy_api_crud"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
[dependencies] [dependencies]
lemmy_apub = { version = "=0.11.3", path = "../apub" } lemmy_apub = { version = "=0.11.4-rc.28", path = "../apub" }
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
lemmy_db_views = { version = "=0.11.3", path = "../db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.11.3", path = "../db_views_moderator" } lemmy_db_views_moderator = { version = "=0.11.4-rc.28", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" } lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" } lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
diesel = "1.4.7" diesel = "1.4.7"
bcrypt = "0.10.1" bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }

18
crates/apub/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_apub" name = "lemmy_apub"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -11,14 +11,14 @@ path = "src/lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_apub_lib = { version = "=0.11.3", path = "../apub_lib" } lemmy_apub_lib = { version = "=0.11.4-rc.28", path = "../apub_lib" }
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
lemmy_db_views = { version = "=0.11.3", path = "../db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" } lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" } lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
diesel = "1.4.7" diesel = "1.4.7"
activitystreams = "0.7.0-alpha.11" activitystreams = "0.7.0-alpha.11"
bcrypt = "0.10.1" bcrypt = "0.10.1"

8
crates/apub_lib/Cargo.toml
View file

@ -1,14 +1,14 @@
[package] [package]
name = "lemmy_apub_lib" name = "lemmy_apub_lib"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
[dependencies] [dependencies]
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" } lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
lemmy_apub_lib_derive = { version = "=0.11.3", path = "../apub_lib_derive" } lemmy_apub_lib_derive = { version = "=0.11.4-rc.28", path = "../apub_lib_derive" }
activitystreams = "0.7.0-alpha.11" activitystreams = "0.7.0-alpha.11"
serde = { version = "1.0.127", features = ["derive"] } serde = { version = "1.0.127", features = ["derive"] }
async-trait = "0.1.51" async-trait = "0.1.51"

2
crates/apub_lib_derive/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_apub_lib_derive" name = "lemmy_apub_lib_derive"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"

6
crates/db_queries/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_db_queries" name = "lemmy_db_queries"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -11,8 +11,8 @@ path = "src/lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] } diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
diesel_migrations = "1.4.0" diesel_migrations = "1.4.0"
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }

2
crates/db_schema/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_db_schema" name = "lemmy_db_schema"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"

6
crates/db_views/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_db_views" name = "lemmy_db_views"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -9,8 +9,8 @@ license = "AGPL-3.0"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] } diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.127", features = ["derive"] } serde = { version = "1.0.127", features = ["derive"] }
log = "0.4.14" log = "0.4.14"

6
crates/db_views_actor/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_db_views_actor" name = "lemmy_db_views_actor"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -9,7 +9,7 @@ license = "AGPL-3.0"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] } diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.127", features = ["derive"] } serde = { version = "1.0.127", features = ["derive"] }

6
crates/db_views_moderator/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_db_views_moderator" name = "lemmy_db_views_moderator"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -9,7 +9,7 @@ license = "AGPL-3.0"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] } diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.127", features = ["derive"] } serde = { version = "1.0.127", features = ["derive"] }

18
crates/routes/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_routes" name = "lemmy_routes"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -9,14 +9,14 @@ license = "AGPL-3.0"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_websocket = { version = "=0.11.3", path = "../websocket" } lemmy_websocket = { version = "=0.11.4-rc.28", path = "../websocket" }
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_views = { version = "=0.11.3", path = "../db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" } lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
lemmy_apub_lib = { version = "=0.11.3", path = "../apub_lib" } lemmy_apub_lib = { version = "=0.11.4-rc.28", path = "../apub_lib" }
diesel = "1.4.7" diesel = "1.4.7"
actix = "0.12.0" actix = "0.12.0"
actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["rustls"] } actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["rustls"] }

2
crates/utils/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_utils" name = "lemmy_utils"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"

14
crates/websocket/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "lemmy_websocket" name = "lemmy_websocket"
version = "0.11.3" version = "0.11.4-rc.28"
edition = "2018" edition = "2018"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -11,12 +11,12 @@ path = "src/lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
lemmy_utils = { version = "=0.11.3", path = "../utils" } lemmy_utils = { version = "=0.11.4-rc.28", path = "../utils" }
lemmy_api_common = { version = "=0.11.3", path = "../api_common" } lemmy_api_common = { version = "=0.11.4-rc.28", path = "../api_common" }
lemmy_db_queries = { version = "=0.11.3", path = "../db_queries" } lemmy_db_queries = { version = "=0.11.4-rc.28", path = "../db_queries" }
lemmy_db_schema = { version = "=0.11.3", path = "../db_schema" } lemmy_db_schema = { version = "=0.11.4-rc.28", path = "../db_schema" }
lemmy_db_views = { version = "=0.11.3", path = "../db_views" } lemmy_db_views = { version = "=0.11.4-rc.28", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.11.3", path = "../db_views_actor" } lemmy_db_views_actor = { version = "=0.11.4-rc.28", path = "../db_views_actor" }
reqwest = { version = "0.11.4", features = ["json"] } reqwest = { version = "0.11.4", features = ["json"] }
log = "0.4.14" log = "0.4.14"
rand = "0.8.4" rand = "0.8.4"

9
docker/prod/deploy.sh
View file

@ -2,7 +2,6 @@
#git checkout main #git checkout main
# Creating the new tag # Creating the new tag
old_tag=$(cat "ansible/VERSION")
new_tag="$1" new_tag="$1"
third_semver=$(echo $new_tag | cut -d "." -f 3) third_semver=$(echo $new_tag | cut -d "." -f 3)
@ -21,6 +20,8 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
fi fi
# Update crate versions for crates.io # Update crate versions for crates.io
pushd ../../
old_tag=$(head -3 Cargo.toml | tail -1 | cut -d'"' -f 2)
for crate in crates/*; do for crate in crates/*; do
pushd $crate pushd $crate
# update version of the crate itself (only first occurence) # 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 sed -i "0,/version = \"$old_tag\"/s//version = \"$new_tag\"/g" Cargo.toml
# update version of lemmy dependencies # update version of lemmy dependencies
sed -i "s/{ version = \"=$old_tag\", path/{ version = \"=$new_tag\", path/g" Cargo.toml sed -i "s/{ version = \"=$old_tag\", path/{ version = \"=$new_tag\", path/g" Cargo.toml
git add Cargo.toml
popd popd
done done
# same as above, for the main cargo.toml # 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\", path/{ version = \"=$new_tag\", path/g" Cargo.toml
sed -i "s/version = \"$old_tag\"/version = \"$new_tag\"/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 # The commit
git commit -m"Version $new_tag" git commit -m"Version $new_tag"