Skip to content

Commit

Permalink
Merge pull request #7078 from freedomofpress/rust-1.74.0
Browse files Browse the repository at this point in the history
Update Rust toolchain to 1.74.0
  • Loading branch information
zenmonkeykstop authored Nov 22, 2023
2 parents a6da4fa + e2a7a27 commit 4d9b74b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
rust-security:
# Keep version in sync with rust-toolchain.toml
docker:
- image: rust:1.71.1
- image: rust:1.74.0
steps:
- checkout
- run:
Expand Down
2 changes: 1 addition & 1 deletion builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN apt-get -y update && apt-get upgrade -y && apt-get install -y \
unzip \
zlib1g-dev

ENV RUST_VERSION 1.71.1
ENV RUST_VERSION 1.74.0
ENV RUSTUP_VERSION 1.24.3
ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338
ENV RUSTUP_HOME /opt/rustup
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.71.1"
channel = "1.74.0"
2 changes: 1 addition & 1 deletion securedrop/dockerfiles/focal/python3/DemoDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN apt-get update && \
# 1) Download rustup-init and verify it matches hardcoded checksum
# 2) Run it to install rustup and the rustc/cargo "minimal" toolchain
# 3) Add `/opt/cargo/bin` to $PATH, which is where cargo & rustc are installed
ENV RUST_VERSION 1.71.1
ENV RUST_VERSION 1.74.0
ENV RUSTUP_VERSION 1.24.3
ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338
ENV RUSTUP_HOME /opt/rustup
Expand Down
2 changes: 1 addition & 1 deletion securedrop/dockerfiles/focal/python3/SlimDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install
# 1) Download rustup-init and verify it matches hardcoded checksum
# 2) Run it to install rustup and the rustc/cargo "minimal" toolchain
# 3) Add `/opt/cargo/bin` to $PATH, which is where cargo & rustc are installed
ENV RUST_VERSION 1.71.1
ENV RUST_VERSION 1.74.0
ENV RUSTUP_VERSION 1.24.3
ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338
ENV RUSTUP_HOME /opt/rustup
Expand Down

0 comments on commit 4d9b74b

Please sign in to comment.