From ffd1411e7c40aac05a661d11208feb2e2cf10d16 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Tue, 24 May 2022 14:32:18 +0100
Subject: [PATCH] build: Bump minimum Rust version to 1.60

Some dependencies (e.g. pnet 0.30.0) require it.

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

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 87fe30e1b..7d178f44c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - 1.56
+          - "1.60"
         target:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 11daaf65d..4601be43b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -26,13 +26,13 @@ jobs:
       - name: Build
         uses: actions-rs/cargo@v1
         with:
-            toolchain: 1.58
+            toolchain: "1.60"
             command: build
             args: --all --release --target=x86_64-unknown-linux-gnu
       - name: Static Build
         uses: actions-rs/cargo@v1
         with:
-            toolchain: 1.58
+            toolchain: "1.60"
             command: build
             args: --all --release --target=x86_64-unknown-linux-musl
       - name: Strip cloud-hypervisor binaries
diff --git a/Cargo.toml b/Cargo.toml
index c3f2fddf0..2f6022cb2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,7 @@ description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM
 homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"
 # Minimum buildable version:
 # Keep in sync with version in .github/workflows/build.yaml
-rust-version = "1.56"
+rust-version = "1.60"
 
 [profile.release]
 lto = true
diff --git a/resources/Dockerfile b/resources/Dockerfile
index 41bc80a41..83987b06d 100644
--- a/resources/Dockerfile
+++ b/resources/Dockerfile
@@ -4,7 +4,7 @@
 FROM ubuntu:20.04 as dev
 
 ARG TARGETARCH
-ARG RUST_TOOLCHAIN="1.59.0"
+ARG RUST_TOOLCHAIN="1.60.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 effe282b3..e00bdd701 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -7,7 +7,7 @@
 CLI_NAME="Cloud Hypervisor"
 
 CTR_IMAGE_TAG="cloudhypervisor/dev"
-CTR_IMAGE_VERSION="20220405-0"
+CTR_IMAGE_VERSION="20220526-0"
 CTR_IMAGE="${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}"
 
 DOCKER_RUNTIME="docker"