diff --git a/.github/workflows/cargo-vet.yml b/.github/workflows/cargo-vet.yml index 943437118b..d6873f95bc 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.74.0 + container: rust:1.74.1 env: CARGO_VET_VERSION: 0.8.0 steps: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e85ac471c0..8407a922bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: rust: runs-on: ubuntu-latest # Keep version in sync with rust-toolchain.toml - container: rust:1.74.0 + container: rust:1.74.1 steps: - uses: actions/checkout@v3 - name: Install dependencies diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml index d8912c6e7e..b9703ba263 100644 --- a/.github/workflows/security.yml +++ b/.github/workflows/security.yml @@ -7,7 +7,7 @@ jobs: rust-audit: runs-on: ubuntu-latest # Keep version in sync with rust-toolchain.toml - container: rust:1.74.0 + container: rust:1.74.1 steps: - uses: actions/checkout@v3 - name: Check Rust dependencies diff --git a/builder/Dockerfile b/builder/Dockerfile index e780d998fb..918625fc18 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.74.0 +ENV RUST_VERSION 1.74.1 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 639f4f17d9..27ae62c5bc 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.74.0" +channel = "1.74.1" diff --git a/securedrop/dockerfiles/focal/python3/DemoDockerfile b/securedrop/dockerfiles/focal/python3/DemoDockerfile index e4f898f2f1..1617e49776 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.74.0 +ENV RUST_VERSION 1.74.1 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 39eb54f459..fdfd5ebe2f 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.74.0 +ENV RUST_VERSION 1.74.1 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup