From 587a0de8f7dc00ff5c19ebafd13be4d4594c69b2 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Tue, 28 Jun 2022 21:44:55 +0000 Subject: [PATCH] Specify minimum Rust version 1.57 (fixes #2333) (#2334) * 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 --- .drone.yml | 20 +++++++++++--------- Cargo.toml | 1 + crates/api/Cargo.toml | 1 + crates/api_common/Cargo.toml | 1 + crates/api_crud/Cargo.toml | 1 + crates/apub/Cargo.toml | 1 + crates/db_schema/Cargo.toml | 1 + crates/db_views/Cargo.toml | 1 + crates/db_views_actor/Cargo.toml | 1 + crates/db_views_moderator/Cargo.toml | 1 + crates/routes/Cargo.toml | 1 + crates/utils/Cargo.toml | 1 + crates/websocket/Cargo.toml | 1 + 13 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 628abf569..d18e2650b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,8 +8,9 @@ platform: steps: + # use minimum supported rust version for most steps - name: prepare repo - image: clux/muslrust:1.59.0 + image: clux/muslrust:1.57.0 user: root commands: - git fetch --tags @@ -22,15 +23,16 @@ steps: commands: - /root/.cargo/bin/cargo fmt -- --check + # latest rust for clippy to get extra checks - name: cargo clippy - image: clux/muslrust:1.59.0 + image: rust:1.61-buster commands: - 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 -- -D clippy::unwrap_used - name: cargo test - image: clux/muslrust:1.59.0 + image: clux/muslrust:1.57.0 environment: LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_CONFIG_LOCATION: ../../config/config.hjson @@ -42,20 +44,20 @@ steps: - cargo test --workspace --no-fail-fast - name: check defaults.hjson updated - image: clux/muslrust:1.59.0 + image: clux/muslrust:1.57.0 commands: - ./scripts/update_config_defaults.sh config/defaults_current.hjson - diff config/defaults.hjson config/defaults_current.hjson - name: check with different features - image: clux/muslrust:1.59.0 + image: clux/muslrust:1.57.0 commands: - cargo install cargo-workspaces - cargo workspaces exec cargo check --no-default-features - cargo workspaces exec cargo check --all-features - name: cargo build - image: clux/muslrust:1.59.0 + image: clux/muslrust:1.57.0 commands: - cargo build - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server @@ -169,7 +171,7 @@ platform: steps: - name: prepare repo - image: rust:1.60-slim + image: rust:1.57-slim user: root commands: - chown 1000:1000 . -R @@ -181,7 +183,7 @@ steps: # TODO temporarily disable arm tests # - name: cargo test - # image: rust:1.60-slim + # image: rust:1.57-slim # environment: # LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy # LEMMY_CONFIG_LOCATION: ../../config/config.hjson @@ -196,7 +198,7 @@ steps: # TODO temporarily disable arm tests # Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM. # - name: cargo build - # image: rust:1.60-slim + # image: rust:1.57-slim # commands: # - apt-get update # - apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev diff --git a/Cargo.toml b/Cargo.toml index 6c419d073..c3d52425a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] doctest = false diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 9c65978fc..2b80f16e0 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] name = "lemmy_api" diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml index 4b10207ff..65cac3084 100644 --- a/crates/api_common/Cargo.toml +++ b/crates/api_common/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] name = "lemmy_api_common" diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml index 12ea4305c..0d709aa25 100644 --- a/crates/api_crud/Cargo.toml +++ b/crates/api_crud/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [dependencies] lemmy_apub = { version = "=0.16.5", path = "../apub" } diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml index 7ec5ece6a..7e8e95281 100644 --- a/crates/apub/Cargo.toml +++ b/crates/apub/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] name = "lemmy_apub" diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml index e5f749387..a8eb027be 100644 --- a/crates/db_schema/Cargo.toml +++ b/crates/db_schema/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] name = "lemmy_db_schema" diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml index f8806e43f..956ec8f02 100644 --- a/crates/db_views/Cargo.toml +++ b/crates/db_views/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] doctest = false diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml index ccf4a4a7e..ba31b7780 100644 --- a/crates/db_views_actor/Cargo.toml +++ b/crates/db_views_actor/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] doctest = false diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml index fb1f0b563..b00752ad4 100644 --- a/crates/db_views_moderator/Cargo.toml +++ b/crates/db_views_moderator/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] doctest = false diff --git a/crates/routes/Cargo.toml b/crates/routes/Cargo.toml index 4b9a946cc..b6af9986d 100644 --- a/crates/routes/Cargo.toml +++ b/crates/routes/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] doctest = false diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 4fcf41834..0ceac0906 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] name = "lemmy_utils" diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml index b20e3a805..5cfa97176 100644 --- a/crates/websocket/Cargo.toml +++ b/crates/websocket/Cargo.toml @@ -6,6 +6,7 @@ description = "A link aggregator for the fediverse" license = "AGPL-3.0" homepage = "https://join-lemmy.org/" documentation = "https://join-lemmy.org/docs/en/index.html" +rust-version = "1.57" [lib] name = "lemmy_websocket"