From 8b86c7724b9a3f0664bf015109524113af39462c Mon Sep 17 00:00:00 2001
From: Rob Bradford <rbradford@rivosinc.com>
Date: Tue, 7 May 2024 11:42:51 +0100
Subject: [PATCH] build: Bump MSRV to 1.77.0

The ability to control the rustc flags (required for adding new
attributes to the allowed list of #[cfg(..)]) requires bumping the MSRV
to 1.77.0

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3bd19d03f..d05d8f2af 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.74.1"
+          - "1.77.0"
         target:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
index f7f9e5cca..5fe5b0b22 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -41,7 +41,7 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=20240407-0
+            type=raw,value=20240507-0
             type=sha
 
       - name: Build and push
diff --git a/Cargo.toml b/Cargo.toml
index 1de36fe48..7f5c86d0e 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.74.1"
+rust-version = "1.77.0"
 
 [profile.release]
 lto = true
diff --git a/resources/Dockerfile b/resources/Dockerfile
index 28c1651b8..bb82486cb 100644
--- a/resources/Dockerfile
+++ b/resources/Dockerfile
@@ -8,7 +8,7 @@
 FROM ubuntu:22.04 as dev
 
 ARG TARGETARCH
-ARG RUST_TOOLCHAIN="1.74.1"
+ARG RUST_TOOLCHAIN="1.77.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 439b64ece..2854e0c36 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -9,7 +9,7 @@ CLI_NAME="Cloud Hypervisor"
 CTR_IMAGE_TAG="ghcr.io/cloud-hypervisor/cloud-hypervisor"
 
 # Needs to match explicit version in docker-image.yaml workflow
-CTR_IMAGE_VERSION="20240407-0"
+CTR_IMAGE_VERSION="20240507-0"
 : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}"
 
 DOCKER_RUNTIME="docker"