From 084eb0792d61914a017645144562078f5e3a64f2 Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Thu, 29 Feb 2024 11:35:31 +0000
Subject: [PATCH] build: Bump MSRV to 1.74

This is required for the updated clap crate (see #6237)

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
---
 .github/workflows/build.yaml   |  2 +-
 .github/workflows/release.yaml | 10 +++++-----
 Cargo.toml                     |  2 +-
 resources/Dockerfile           |  2 +-
 scripts/dev_cli.sh             |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5b126ea4d..1a269e0be 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.70"
+          - "1.74"
         target:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 90c368fa8..7f4ed8899 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -19,29 +19,29 @@ jobs:
       - name: Install Rust toolchain (x86_64-unknown-linux-gnu)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.74"
           target: x86_64-unknown-linux-gnu
       - name: Install Rust toolchain (x86_64-unknown-linux-musl)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.74"
           target: x86_64-unknown-linux-musl
       - name: Build
         uses: actions-rs/cargo@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.74"
           command: build
           args: --all --release --features mshv --target=x86_64-unknown-linux-gnu
       - name: Static Build
         uses: actions-rs/cargo@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.74"
           command: build
           args: --all --release --features mshv --target=x86_64-unknown-linux-musl
       - name: Install Rust toolchain (aarch64-unknown-linux-musl)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.74"
           target: aarch64-unknown-linux-musl
           override: true
       - name: Create Release
diff --git a/Cargo.toml b/Cargo.toml
index 4ef238214..774e9018a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"
 # a.) A dependency requires it,
 # b.) If we want to use a new feature and that MSRV is at least 6 months old,
 # c.) There is a security issue that is addressed by the toolchain update.
-rust-version = "1.70"
+rust-version = "1.74"
 
 [profile.release]
 lto = true
diff --git a/resources/Dockerfile b/resources/Dockerfile
index 0b370061b..33b0e8086 100644
--- a/resources/Dockerfile
+++ b/resources/Dockerfile
@@ -6,7 +6,7 @@
 FROM ubuntu:22.04 as dev
 
 ARG TARGETARCH
-ARG RUST_TOOLCHAIN="1.70.0"
+ARG RUST_TOOLCHAIN="1.74.0"
 ARG CLH_SRC_DIR="/cloud-hypervisor"
 ARG CLH_BUILD_DIR="$CLH_SRC_DIR/build"
 ARG CARGO_REGISTRY_DIR="$CLH_BUILD_DIR/cargo_registry"
diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh
index 8a3742639..d217d60a9 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -7,7 +7,7 @@
 CLI_NAME="Cloud Hypervisor"
 
 CTR_IMAGE_TAG="ghcr.io/cloud-hypervisor/cloud-hypervisor"
-CTR_IMAGE_VERSION="20231220-0"
+CTR_IMAGE_VERSION="20240229-0"
 : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}"
 
 DOCKER_RUNTIME="docker"