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

Update to Rust 1.60 (#2247)

Browse source
This commit is contained in:
Nutomic 2022-05-10 17:04:40 +00:00 committed by GitHub
parent ef12cd9588
commit 99f3141841
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.drone.yml
View file

@ -9,7 +9,7 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: clux/muslrust:1.56.0 image: clux/muslrust:1.60.0
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -23,19 +23,19 @@ steps:
- /root/.cargo/bin/cargo fmt -- --check - /root/.cargo/bin/cargo fmt -- --check
- name: check lemmy_api_common with minimal deps - name: check lemmy_api_common with minimal deps
image: clux/muslrust:1.56.0 image: clux/muslrust:1.60.0
commands: commands:
- cargo check -p lemmy_api_common - cargo check -p lemmy_api_common
- name: cargo clippy - name: cargo clippy
image: clux/muslrust:1.56.0 image: clux/muslrust:1.60.0
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.56.0 image: clux/muslrust:1.60.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
@ -47,13 +47,13 @@ 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.56.0 image: clux/muslrust:1.60.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: cargo build - name: cargo build
image: clux/muslrust:1.56.0 image: clux/muslrust:1.60.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
@ -152,7 +152,7 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: rust:1.56-slim image: rust:1.60-slim
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -164,7 +164,7 @@ steps:
# TODO temporarily disable arm tests # TODO temporarily disable arm tests
# - name: cargo test # - name: cargo test
# image: rust:1.56-slim # image: rust:1.60-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
@ -179,7 +179,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.56-slim # image: rust:1.60-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

2
.rustfmt.toml
View file

@ -1,5 +1,5 @@
tab_spaces = 2 tab_spaces = 2
edition="2018" edition="2021"
imports_layout="HorizontalVertical" imports_layout="HorizontalVertical"
imports_granularity="Crate" imports_granularity="Crate"
reorder_imports=true reorder_imports=true

2
docker/dev/Dockerfile
View file

@ -1,4 +1,4 @@
ARG RUST_BUILDER_IMAGE=clux/muslrust:1.56.0 ARG RUST_BUILDER_IMAGE=clux/muslrust:1.60.0
FROM $RUST_BUILDER_IMAGE as chef FROM $RUST_BUILDER_IMAGE as chef
USER root USER root

2
docker/prod/Dockerfile
View file

@ -1,5 +1,5 @@
# Build the project # Build the project
FROM clux/muslrust:1.56.0 as builder FROM clux/muslrust:1.60.0 as builder
ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
ARG RUSTRELEASEDIR="release" ARG RUSTRELEASEDIR="release"

2
docker/prod/Dockerfile.arm
View file

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