diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fc6ca65a..ce5d94ac8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -116,7 +116,7 @@ docker build debugging: cargo check: stage: test - image: docker.io/rust:1.74.1-bullseye + image: docker.io/rust:1.75.0-bullseye needs: [] interruptible: true before_script: diff --git a/Cargo.toml b/Cargo.toml index 3d29662d5..96bf21036 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" # `nix flake update`. If you don't have Nix installed or otherwise don't know # how to do this, ping `@charles:computer.surgery` or `@dusk:gaze.systems` in # the matrix room. -rust-version = "1.74.1" +rust-version = "1.75.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/DIFFERENCES.md b/DIFFERENCES.md index 6fe0a5492..1fa3577da 100644 --- a/DIFFERENCES.md +++ b/DIFFERENCES.md @@ -42,7 +42,7 @@ - Safer and cleaner shutdowns on both database side as we run cleanup on shutdown and exits database loop better (no potential hanging issues in database loop), overall cleaner shutdown logic - Basic binary commands like `conduwuit --version` work (interested in expanding it more) - Allow HEAD HTTP requests in CORS for clients (despite not being explicity mentioned in Matrix spec, HTTP spec says all HEAD requests need to behave the same as GET requests, Synapse supports HEAD requests) -- Bump MSRV to 1.74.1 +- Bump MSRV to 1.75.0 for Cargo.toml workspace lints and latest ruma using 1.75.0 - Purge unmaintained/irrelevant/broken database backends (heed, sled, persy) - webp support for images - Support for suggesting servers to join at `/_matrix/client/v3/directory/room/{roomAlias}` diff --git a/Dockerfile b/Dockerfile index 655b2099f..0200a3c61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM docker.io/rust:1.74.1-bullseye AS base +FROM docker.io/rust:1.75.0-bullseye AS base FROM base AS builder WORKDIR /usr/src/conduit