mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-09 09:52:10 +00:00
Upgrade Rust version
This commit is contained in:
parent
462c4a2954
commit
66946117e1
12
.drone.yml
12
.drone.yml
|
@ -9,7 +9,7 @@ platform:
|
|||
steps:
|
||||
|
||||
- name: chown repo
|
||||
image: ekidd/rust-musl-builder:1.47.0
|
||||
image: ekidd/rust-musl-builder:1.50.0
|
||||
user: root
|
||||
commands:
|
||||
- chown 1000:1000 . -R
|
||||
|
@ -20,12 +20,12 @@ steps:
|
|||
- /root/.cargo/bin/cargo fmt -- --check
|
||||
|
||||
- name: cargo clippy
|
||||
image: ekidd/rust-musl-builder:1.47.0
|
||||
image: ekidd/rust-musl-builder:1.50.0
|
||||
commands:
|
||||
- cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
|
||||
|
||||
- name: cargo test
|
||||
image: ekidd/rust-musl-builder:1.47.0
|
||||
image: ekidd/rust-musl-builder:1.50.0
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
|
||||
RUST_BACKTRACE: 1
|
||||
|
@ -35,7 +35,7 @@ steps:
|
|||
- cargo test --workspace --no-fail-fast
|
||||
|
||||
- name: cargo build
|
||||
image: ekidd/rust-musl-builder:1.47.0
|
||||
image: ekidd/rust-musl-builder:1.50.0
|
||||
commands:
|
||||
- cargo build
|
||||
- mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server
|
||||
|
@ -102,7 +102,7 @@ platform:
|
|||
steps:
|
||||
|
||||
- name: cargo test
|
||||
image: rust:1.47-slim-buster
|
||||
image: rust:1.50-slim-buster
|
||||
environment:
|
||||
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
|
||||
RUST_BACKTRACE: 1
|
||||
|
@ -114,7 +114,7 @@ steps:
|
|||
|
||||
# Using Debian here because there seems to be no official Alpine-based Rust docker image for ARM.
|
||||
- name: cargo build
|
||||
image: rust:1.47-slim-buster
|
||||
image: rust:1.50-slim-buster
|
||||
commands:
|
||||
- apt-get update
|
||||
- apt-get -y install --no-install-recommends libssl-dev pkg-config libpq-dev
|
||||
|
|
|
@ -4,7 +4,7 @@ set -e
|
|||
export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432
|
||||
|
||||
pushd ..
|
||||
cargo +1.47.0 build
|
||||
cargo build
|
||||
rm target/lemmy_server || true
|
||||
cp target/debug/lemmy_server target/lemmy_server
|
||||
./api_tests/prepare-drone-federation-test.sh
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.47.0
|
||||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.50.0
|
||||
|
||||
# Cargo chef plan
|
||||
FROM $RUST_BUILDER_IMAGE as planner
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:experimental
|
||||
FROM rust:1.47-buster as rust
|
||||
FROM rust:1.50-buster as rust
|
||||
|
||||
ENV HOME=/home/root
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.47.0
|
||||
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.50.0
|
||||
|
||||
# Cargo chef plan
|
||||
FROM $RUST_BUILDER_IMAGE as planner
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
ARG RUST_BUILDER_IMAGE=rust:1.47-slim-buster
|
||||
ARG RUST_BUILDER_IMAGE=rust:1.50-slim-buster
|
||||
|
||||
# Build Lemmy
|
||||
FROM $RUST_BUILDER_IMAGE as builder
|
||||
|
|
|
@ -12,7 +12,7 @@ for ((i=0; i < times; i++)) ; do
|
|||
cargo clean
|
||||
echo "cargo build"
|
||||
start=$(date +%s.%N)
|
||||
RUSTC_WRAPPER='' cargo +1.47.0 build -q
|
||||
RUSTC_WRAPPER='' cargo build -q
|
||||
end=$(date +%s.%N)
|
||||
echo "Finished iteration $i after $(bc <<< "scale=0; $end - $start") seconds"
|
||||
duration=$(bc <<< "$duration + $end - $start")
|
||||
|
|
|
@ -10,4 +10,4 @@ export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
|
|||
# Integration tests only work on stable due to a bug in config-rs
|
||||
# https://github.com/mehcode/config-rs/issues/158
|
||||
RUST_BACKTRACE=1 RUST_TEST_THREADS=1 \
|
||||
cargo +1.47.0 test --workspace --no-fail-fast
|
||||
cargo test --workspace --no-fail-fast
|
||||
|
|
Loading…
Reference in a new issue