diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 68f89adf4..3bd19d03f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: - stable - beta - nightly - - "1.74" + - "1.74.1" target: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index adce07f71..f7dfed825 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.74" + toolchain: "1.74.1" target: x86_64-unknown-linux-gnu - name: Install Rust toolchain (x86_64-unknown-linux-musl) uses: actions-rs/toolchain@v1 with: - toolchain: "1.74" + toolchain: "1.74.1" target: x86_64-unknown-linux-musl - name: Build uses: actions-rs/cargo@v1 with: - toolchain: "1.74" + toolchain: "1.74.1" command: build args: --all --release --features mshv --target=x86_64-unknown-linux-gnu - name: Static Build uses: actions-rs/cargo@v1 with: - toolchain: "1.74" + toolchain: "1.74.1" 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.74" + toolchain: "1.74.1" target: aarch64-unknown-linux-musl override: true - name: Create Release diff --git a/Cargo.toml b/Cargo.toml index 387aa1d75..5d636c8a1 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" +rust-version = "1.74.1" [profile.release] lto = true diff --git a/resources/Dockerfile b/resources/Dockerfile index 33b0e8086..ef88eddbc 100644 --- a/resources/Dockerfile +++ b/resources/Dockerfile @@ -6,7 +6,7 @@ FROM ubuntu:22.04 as dev ARG TARGETARCH -ARG RUST_TOOLCHAIN="1.74.0" +ARG RUST_TOOLCHAIN="1.74.1" 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 d217d60a9..233b7246c 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="20240229-0" +CTR_IMAGE_VERSION="20240407-0" : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}" DOCKER_RUNTIME="docker"