grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1770 from LemmyNet/fix/arm_build

Browse source 
Fix/arm build
This commit is contained in:
Nutomic 2021-09-06 11:30:40 +00:00 committed by GitHub
commit 9a2dc53097
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 100 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

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

26
Cargo.toml
View file

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

20
crates/api/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_api"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../apub" }
lemmy_utils = { version = "=0.12.0", path = "../utils" }
lemmy_db_queries = { version = "=0.12.0", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_db_views = { version = "=0.12.0", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.12.0", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.12.0", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.12.0", path = "../api_common" }
lemmy_websocket = { version = "=0.12.0", path = "../websocket" }
lemmy_apub = { version = "=0.12.2-rc.1", path = "../apub" }
lemmy_utils = { version = "=0.12.2-rc.1", path = "../utils" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
lemmy_db_views = { version = "=0.12.2-rc.1", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.12.2-rc.1", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.12.2-rc.1", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.12.2-rc.1", path = "../api_common" }
lemmy_websocket = { version = "=0.12.2-rc.1", path = "../websocket" }
diesel = "1.4.7"
bcrypt = "0.10.1"
chrono = { version = "0.4.19", features = ["serde"] }

14
crates/api_common/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_api_common"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../db_queries" }
lemmy_db_views = { version = "=0.12.0", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.12.0", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.12.0", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_utils = { version = "=0.12.0", path = "../utils" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_views = { version = "=0.12.2-rc.1", path = "../db_views" }
lemmy_db_views_moderator = { version = "=0.12.2-rc.1", path = "../db_views_moderator" }
lemmy_db_views_actor = { version = "=0.12.2-rc.1", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
lemmy_utils = { version = "=0.12.2-rc.1", path = "../utils" }
serde = { version = "1.0.129", features = ["derive"] }
log = "0.4.14"
diesel = "1.4.7"

20
crates/api_crud/Cargo.toml
View file

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

18
crates/apub/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_apub"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../utils" }
lemmy_apub_lib = { version = "=0.12.0", path = "../apub_lib" }
lemmy_db_queries = { version = "=0.12.0", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_db_views = { version = "=0.12.0", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.12.0", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.12.0", path = "../api_common" }
lemmy_websocket = { version = "=0.12.0", path = "../websocket" }
lemmy_utils = { version = "=0.12.2-rc.1", path = "../utils" }
lemmy_apub_lib = { version = "=0.12.2-rc.1", path = "../apub_lib" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
lemmy_db_views = { version = "=0.12.2-rc.1", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.12.2-rc.1", path = "../db_views_actor" }
lemmy_api_common = { version = "=0.12.2-rc.1", path = "../api_common" }
lemmy_websocket = { version = "=0.12.2-rc.1", path = "../websocket" }
diesel = "1.4.7"
activitystreams = "0.7.0-alpha.11"
bcrypt = "0.10.1"

8
crates/apub_lib/Cargo.toml
View file

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

2
crates/apub_lib_derive/Cargo.toml
View file

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

6
crates/db_queries/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_queries"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../utils" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_utils = { version = "=0.12.2-rc.1", path = "../utils" }
lemmy_db_schema = { version = "=0.12.2-rc.1", 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"] }

2
crates/db_schema/Cargo.toml
View file

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

6
crates/db_views/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_views"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.129", features = ["derive"] }
log = "0.4.14"

6
crates/db_views_actor/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_views_actor"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.129", features = ["derive"] }

6
crates/db_views_moderator/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_db_views_moderator"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
diesel = { version = "1.4.7", features = ["postgres","chrono","r2d2","serde_json"] }
serde = { version = "1.0.129", features = ["derive"] }

18
crates/routes/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_routes"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../utils" }
lemmy_websocket = { version = "=0.12.0", path = "../websocket" }
lemmy_db_queries = { version = "=0.12.0", path = "../db_queries" }
lemmy_db_views = { version = "=0.12.0", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.12.0", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_api_common = { version = "=0.12.0", path = "../api_common" }
lemmy_apub_lib = { version = "=0.12.0", path = "../apub_lib" }
lemmy_utils = { version = "=0.12.2-rc.1", path = "../utils" }
lemmy_websocket = { version = "=0.12.2-rc.1", path = "../websocket" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_views = { version = "=0.12.2-rc.1", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.12.2-rc.1", path = "../db_views_actor" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
lemmy_api_common = { version = "=0.12.2-rc.1", path = "../api_common" }
lemmy_apub_lib = { version = "=0.12.2-rc.1", path = "../apub_lib" }
diesel = "1.4.7"
actix = "0.12.0"
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]
name = "lemmy_utils"
version = "0.12.0"
version = "0.12.2-rc.1"
edition = "2018"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"

14
crates/websocket/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "lemmy_websocket"
version = "0.12.0"
version = "0.12.2-rc.1"
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.12.0", path = "../utils" }
lemmy_api_common = { version = "=0.12.0", path = "../api_common" }
lemmy_db_queries = { version = "=0.12.0", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.0", path = "../db_schema" }
lemmy_db_views = { version = "=0.12.0", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.12.0", path = "../db_views_actor" }
lemmy_utils = { version = "=0.12.2-rc.1", path = "../utils" }
lemmy_api_common = { version = "=0.12.2-rc.1", path = "../api_common" }
lemmy_db_queries = { version = "=0.12.2-rc.1", path = "../db_queries" }
lemmy_db_schema = { version = "=0.12.2-rc.1", path = "../db_schema" }
lemmy_db_views = { version = "=0.12.2-rc.1", path = "../db_views" }
lemmy_db_views_actor = { version = "=0.12.2-rc.1", path = "../db_views_actor" }
reqwest = { version = "0.11.4", features = ["json"] }
log = "0.4.14"
rand = "0.8.4"

2
docker/prod/Dockerfile.arm
View file

@ -1,4 +1,4 @@
ARG RUST_BUILDER_IMAGE=rust:1-slim
ARG RUST_BUILDER_IMAGE=rust:1.51-slim
# Build Lemmy
FROM $RUST_BUILDER_IMAGE as builder