From d5e8a1f878918efce46699d28e25c55aa5e92835 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 19 Sep 2024 12:43:02 -0400 Subject: [PATCH] Update Rust toolchain to 1.81.0 Doesn't appear to need any changes. Fixes #7227. --- .github/workflows/cargo-vet.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/security.yml | 2 +- builder/Dockerfile | 2 +- rust-toolchain.toml | 2 +- securedrop/dockerfiles/focal/python3/DemoDockerfile | 2 +- securedrop/dockerfiles/focal/python3/SlimDockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cargo-vet.yml b/.github/workflows/cargo-vet.yml index 6f43e06b3b..4bccb20434 100644 --- a/.github/workflows/cargo-vet.yml +++ b/.github/workflows/cargo-vet.yml @@ -9,7 +9,7 @@ jobs: name: Vet Dependencies runs-on: ubuntu-latest # Keep version in sync with rust-toolchain.toml - container: rust:1.78.0 + container: rust:1.81.0 env: CARGO_VET_VERSION: 0.9.0 steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 853f74aeaa..1d64da57ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -72,7 +72,7 @@ jobs: rust: runs-on: ubuntu-latest # Keep version in sync with rust-toolchain.toml - container: rust:1.78.0 + container: rust:1.81.0 steps: - uses: actions/checkout@v4 - name: Install dependencies diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index d37d83ec2a..c063f062a3 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -10,7 +10,7 @@ jobs: rust-audit: runs-on: ubuntu-latest # Keep version in sync with rust-toolchain.toml - container: rust:1.78.0 + container: rust:1.81.0 steps: - uses: actions/checkout@v4 - name: Check Rust dependencies diff --git a/builder/Dockerfile b/builder/Dockerfile index 86d6076ec2..f86b16a8ed 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get -y update && apt-get upgrade -y && apt-get install -y \ unzip \ zlib1g-dev -ENV RUST_VERSION 1.78.0 +ENV RUST_VERSION 1.81.0 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 51985806fc..1de01fa45c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.78.0" +channel = "1.81.0" diff --git a/securedrop/dockerfiles/focal/python3/DemoDockerfile b/securedrop/dockerfiles/focal/python3/DemoDockerfile index 1cbca1c3af..e2e628c30f 100644 --- a/securedrop/dockerfiles/focal/python3/DemoDockerfile +++ b/securedrop/dockerfiles/focal/python3/DemoDockerfile @@ -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.78.0 +ENV RUST_VERSION 1.81.0 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup diff --git a/securedrop/dockerfiles/focal/python3/SlimDockerfile b/securedrop/dockerfiles/focal/python3/SlimDockerfile index 43241d3c80..48aa208435 100644 --- a/securedrop/dockerfiles/focal/python3/SlimDockerfile +++ b/securedrop/dockerfiles/focal/python3/SlimDockerfile @@ -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.78.0 +ENV RUST_VERSION 1.81.0 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup