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

Updating to rust 1.51.0 (#1598)

upgrade_pictrs_4
Dessalines 2021-05-03 10:46:12 -04:00 committed by GitHub
parent 6eed6cf362
commit f67b0e9ff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.drone.yml
View File

@ -9,7 +9,7 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: ekidd/rust-musl-builder:1.50.0 image: ekidd/rust-musl-builder:1.51.0
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -21,13 +21,13 @@ 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.50.0 image: ekidd/rust-musl-builder:1.51.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
- cargo clippy --workspace -- -D clippy::unwrap_used - cargo clippy --workspace -- -D clippy::unwrap_used
- name: cargo test - name: cargo test
image: ekidd/rust-musl-builder:1.50.0 image: ekidd/rust-musl-builder:1.51.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
@ -39,7 +39,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.50.0 image: ekidd/rust-musl-builder:1.51.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
@ -138,7 +138,7 @@ platform:
steps: steps:
- name: prepare repo - name: prepare repo
image: rust:1.50-slim-buster image: rust:1.51-slim-buster
user: root user: root
commands: commands:
- chown 1000:1000 . -R - chown 1000:1000 . -R
@ -147,7 +147,7 @@ steps:
- git fetch --tags - git fetch --tags
- name: cargo test - name: cargo test
image: rust:1.50-slim-buster image: rust:1.51-slim-buster
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
@ -161,7 +161,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.50-slim-buster image: rust:1.51-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
docker/dev/Dockerfile
View File

@ -1,4 +1,4 @@
ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.50.0 ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.51.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,7 +1,7 @@
# syntax=docker/dockerfile:experimental # syntax=docker/dockerfile:experimental
# Warning: this will not pick up migrations unless there are code changes # Warning: this will not pick up migrations unless there are code changes
FROM rust:1.50-buster as rust FROM rust:1.51-buster as rust
ENV HOME=/home/root ENV HOME=/home/root

2
docker/prod/Dockerfile
View File

@ -1,5 +1,5 @@
# Build the project # Build the project
FROM ekidd/rust-musl-builder:1.50.0 as builder FROM ekidd/rust-musl-builder:1.51.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.50-slim-buster ARG RUST_BUILDER_IMAGE=rust:1.51.0-slim-buster
# Build Lemmy # Build Lemmy
FROM $RUST_BUILDER_IMAGE as builder FROM $RUST_BUILDER_IMAGE as builder