Skip to content

Commit

Permalink
Upgrade to Rust 1.81
Browse files Browse the repository at this point in the history
Summary:
Rust 1.81 introduced new [lifetime rules](rust-lang/rust#117967), which opaque-ke, a crate we depend on, violated. The maintainers of that crate have introduced a new version that satisifies these new rules, and we have upgraded to this version in D13895. Now that we've upgraded the dependency, we should bump Rust to the latest stable version.

EDIT: we can't upgrade to 1.82, the latest stable version, because of an issue with `wasm-bindgen`: https://linear.app/comm/issue/ENG-9892/cant-upgrade-to-rust-182

Depends on D13895

Test Plan: All crates build locally and in Docker (CI)

Reviewers: will, bartek

Subscribers: ashoat, tomek

Differential Revision: https://phab.comm.dev/D13896
  • Loading branch information
vdhanan committed Nov 8, 2024
1 parent 6580b06 commit 6385195
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion keyserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ RUN mkdir /home/comm/backups

# Install Rust and add Cargo's bin directory to the $PATH environment variable
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
--default-toolchain 1.76
--default-toolchain 1.81
ENV PATH /home/comm/.cargo/bin:$PATH

#-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.76"
channel = "1.81"
profile = "default"
2 changes: 1 addition & 1 deletion services/backup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye as builder
FROM rust:1.81-bullseye as builder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down
2 changes: 1 addition & 1 deletion services/blob/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye as builder
FROM rust:1.81-bullseye as builder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down
2 changes: 1 addition & 1 deletion services/commtest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye
FROM rust:1.81-bullseye

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down
2 changes: 1 addition & 1 deletion services/feature-flags/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye as builder
FROM rust:1.81-bullseye as builder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down
2 changes: 1 addition & 1 deletion services/identity/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye as builder
FROM rust:1.81-bullseye as builder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down
2 changes: 1 addition & 1 deletion services/reports/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye as builder
FROM rust:1.81-bullseye as builder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down
16 changes: 12 additions & 4 deletions services/search-index-lambda/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion services/tunnelbroker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.76-bullseye as builder
FROM rust:1.81-bullseye as builder

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \
Expand Down

0 comments on commit 6385195

Please sign in to comment.