gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Upgrade Rust version' (#181) from upgrade-rust into main 

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/181
pull/1478/head
dessalines 2021-03-01 18:02:39 +00:00
parent 462c4a2954 66946117e1
commit 45e05dac30
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.drone.yml
View File

@ -9,7 +9,7 @@ platform:
steps: steps:
- name: chown repo - name: chown repo
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.50.0
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -20,12 +20,12 @@ steps:
- /root/.cargo/bin/cargo fmt -- --check - /root/.cargo/bin/cargo fmt -- --check
- name: cargo clippy - name: cargo clippy
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.50.0
commands: commands:
- 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
- name: cargo test - name: cargo test
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.50.0
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
@ -35,7 +35,7 @@ steps:
- cargo test --workspace --no-fail-fast - cargo test --workspace --no-fail-fast
- name: cargo build - name: cargo build
image: ekidd/rust-musl-builder:1.47.0 image: ekidd/rust-musl-builder:1.50.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
@ -102,7 +102,7 @@ platform:
steps: steps:
- name: cargo test - name: cargo test
image: rust:1.47-slim-buster image: rust:1.50-slim-buster
environment: environment:
LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
RUST_BACKTRACE: 1 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. # 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.47-slim-buster image: rust:1.50-slim-buster
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
api_tests/run-federation-test.sh
View File

@ -4,7 +4,7 @@ set -e
export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432 export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432
pushd .. pushd ..
cargo +1.47.0 build cargo build
rm target/lemmy_server || true rm target/lemmy_server || true
cp target/debug/lemmy_server target/lemmy_server cp target/debug/lemmy_server target/lemmy_server
./api_tests/prepare-drone-federation-test.sh ./api_tests/prepare-drone-federation-test.sh

2
docker/dev/Dockerfile
View File

@ -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 # Cargo chef plan
FROM $RUST_BUILDER_IMAGE as planner FROM $RUST_BUILDER_IMAGE as planner

2
docker/dev/volume_mount.dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:experimental # syntax=docker/dockerfile:experimental
FROM rust:1.47-buster as rust FROM rust:1.50-buster as rust
ENV HOME=/home/root ENV HOME=/home/root

2
docker/prod/Dockerfile
View File

@ -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 # Cargo chef plan
FROM $RUST_BUILDER_IMAGE as planner FROM $RUST_BUILDER_IMAGE as planner

2
docker/prod/Dockerfile.arm
View File

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

2
scripts/compilation_benchmark.sh
View File

@ -12,7 +12,7 @@ for ((i=0; i < times; i++)) ; do
cargo clean cargo clean
echo "cargo build" echo "cargo build"
start=$(date +%s.%N) start=$(date +%s.%N)
RUSTC_WRAPPER='' cargo +1.47.0 build -q RUSTC_WRAPPER='' cargo build -q
end=$(date +%s.%N) end=$(date +%s.%N)
echo "Finished iteration $i after $(bc <<< "scale=0; $end - $start") seconds" echo "Finished iteration $i after $(bc <<< "scale=0; $end - $start") seconds"
duration=$(bc <<< "$duration + $end - $start") duration=$(bc <<< "$duration + $end - $start")

2
scripts/test.sh
View File

@ -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 # Integration tests only work on stable due to a bug in config-rs
# https://github.com/mehcode/config-rs/issues/158 # https://github.com/mehcode/config-rs/issues/158
RUST_BACKTRACE=1 RUST_TEST_THREADS=1 \ RUST_BACKTRACE=1 RUST_TEST_THREADS=1 \
cargo +1.47.0 test --workspace --no-fail-fast cargo test --workspace --no-fail-fast