Skip to content

Commit

Permalink
Specify minimum Rust version 1.57 (fixes #2333)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nutomic committed Jun 27, 2022
1 parent a745fa6 commit 19e9aeb
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .drone.yml
Expand Up @@ -9,7 +9,7 @@ platform:
steps:

- name: prepare repo
image: clux/muslrust:1.59.0
image: clux/muslrust:1.57.0
user: root
commands:
- git fetch --tags
Expand All @@ -23,14 +23,14 @@ steps:
- /root/.cargo/bin/cargo fmt -- --check

- name: cargo clippy
image: clux/muslrust:1.59.0
image: clux/muslrust:1.57.0
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
Expand All @@ -42,20 +42,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
Expand Down Expand Up @@ -169,7 +169,7 @@ platform:
steps:

- name: prepare repo
image: rust:1.60-slim
image: rust:1.57-slim
user: root
commands:
- chown 1000:1000 . -R
Expand All @@ -181,7 +181,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
Expand All @@ -196,7 +196,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
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions crates/api/Cargo.toml
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions crates/api_common/Cargo.toml
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions crates/api_crud/Cargo.toml
Expand Up @@ -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" }
Expand Down
1 change: 1 addition & 0 deletions crates/apub/Cargo.toml
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions crates/db_schema/Cargo.toml
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions crates/db_views/Cargo.toml
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions crates/db_views_actor/Cargo.toml
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions crates/db_views_moderator/Cargo.toml
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions crates/routes/Cargo.toml
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions crates/utils/Cargo.toml
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions crates/websocket/Cargo.toml
Expand Up @@ -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"
Expand Down

0 comments on commit 19e9aeb

Please sign in to comment.