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

Specify minimum Rust version 1.57 (fixes #2333) (#2334)

Browse source 
* Specify minimum Rust version 1.57 (fixes #2333)

* use latest rust for clippy

* use rust 1.60 for clippy

* no add component

* use official rust docker

* comments
This commit is contained in:
Nutomic 2022-06-28 21:44:55 +00:00 committed by GitHub
parent a745fa6f43
commit 587a0de8f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.drone.yml
View file

@ -8,8 +8,9 @@ platform:
steps: steps:
# use minimum supported rust version for most steps
- name: prepare repo - name: prepare repo
image: clux/muslrust:1.59.0 image: clux/muslrust:1.57.0
user: root user: root
commands: commands:
- git fetch --tags - git fetch --tags
@ -22,15 +23,16 @@ steps:
commands: commands:
- /root/.cargo/bin/cargo fmt -- --check - /root/.cargo/bin/cargo fmt -- --check
# latest rust for clippy to get extra checks
- name: cargo clippy - name: cargo clippy
image: clux/muslrust:1.59.0 image: rust:1.61-buster
commands: commands:
- rustup component add clippy - rustup component add clippy
- cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
- cargo clippy --workspace -- -D clippy::unwrap_used - cargo clippy --workspace -- -D clippy::unwrap_used
- name: cargo test - name: cargo test
image: clux/muslrust:1.59.0 image: clux/muslrust:1.57.0
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
@ -42,20 +44,20 @@ steps:
- cargo test --workspace --no-fail-fast - cargo test --workspace --no-fail-fast
- name: check defaults.hjson updated - name: check defaults.hjson updated
image: clux/muslrust:1.59.0 image: clux/muslrust:1.57.0
commands: commands:
- ./scripts/update_config_defaults.sh config/defaults_current.hjson - ./scripts/update_config_defaults.sh config/defaults_current.hjson
- diff config/defaults.hjson config/defaults_current.hjson - diff config/defaults.hjson config/defaults_current.hjson
- name: check with different features - name: check with different features
image: clux/muslrust:1.59.0 image: clux/muslrust:1.57.0
commands: commands:
- cargo install cargo-workspaces - cargo install cargo-workspaces
- cargo workspaces exec cargo check --no-default-features - cargo workspaces exec cargo check --no-default-features
- cargo workspaces exec cargo check --all-features - cargo workspaces exec cargo check --all-features
- name: cargo build - name: cargo build
image: clux/muslrust:1.59.0 image: clux/muslrust:1.57.0
commands: commands:
- cargo build - cargo build
- 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
@ -169,7 +171,7 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: rust:1.60-slim image: rust:1.57-slim
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -181,7 +183,7 @@ steps:
# TODO temporarily disable arm tests # TODO temporarily disable arm tests
# - name: cargo test # - name: cargo test
# image: rust:1.60-slim # image: rust:1.57-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
@ -196,7 +198,7 @@ steps:
# TODO temporarily disable arm tests # TODO temporarily disable arm tests
# 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.60-slim # image: rust:1.57-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

1
Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
doctest = false doctest = false

1
crates/api/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
name = "lemmy_api" name = "lemmy_api"

1
crates/api_common/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
name = "lemmy_api_common" name = "lemmy_api_common"

1
crates/api_crud/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[dependencies] [dependencies]
lemmy_apub = { version = "=0.16.5", path = "../apub" } lemmy_apub = { version = "=0.16.5", path = "../apub" }

1
crates/apub/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
name = "lemmy_apub" name = "lemmy_apub"

1
crates/db_schema/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
name = "lemmy_db_schema" name = "lemmy_db_schema"

1
crates/db_views/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
doctest = false doctest = false

1
crates/db_views_actor/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
doctest = false doctest = false

1
crates/db_views_moderator/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
doctest = false doctest = false

1
crates/routes/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
doctest = false doctest = false

1
crates/utils/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
name = "lemmy_utils" name = "lemmy_utils"

1
crates/websocket/Cargo.toml
View file

@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
homepage = "https://join-lemmy.org/" homepage = "https://join-lemmy.org/"
documentation = "https://join-lemmy.org/docs/en/index.html" documentation = "https://join-lemmy.org/docs/en/index.html"
rust-version = "1.57"
[lib] [lib]
name = "lemmy_websocket" name = "lemmy_websocket"