diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 070650ba6..297b2e153 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,7 @@ jobs: - stable - beta - nightly - - "1.83.0" + - "1.87.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 6891d6099..b5bbdf428 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=20250412-0 + type=raw,value=20250807-0 type=sha - name: Build and push diff --git a/.github/workflows/preview-riscv64.yaml b/.github/workflows/preview-riscv64.yaml index 84435402a..6e4c5071e 100644 --- a/.github/workflows/preview-riscv64.yaml +++ b/.github/workflows/preview-riscv64.yaml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: Install Rust toolchain - run: /opt/scripts/exec-in-qemu.sh rustup default 1.83.0 + run: /opt/scripts/exec-in-qemu.sh rustup default 1.87.0 - name: Build ${{ matrix.module }} Module (kvm) run: /opt/scripts/exec-in-qemu.sh cargo rustc --locked -p ${{ matrix.module }} --no-default-features --features "kvm" -- -D warnings -D clippy::undocumented_unsafe_blocks -W clippy::assertions_on_result_states diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 01d4d6d81..ef1eb3573 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -45,7 +45,7 @@ jobs: target: ${{ matrix.platform.target }} args: ${{ matrix.platform.args }} strip: true - toolchain: "1.83.0" + toolchain: "1.87.0" - name: Copy Release Binaries if: github.event_name == 'create' && github.event.ref_type == 'tag' shell: bash diff --git a/Cargo.toml b/Cargo.toml index 4e1848010..c19c07076 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,7 @@ version = "47.0.0" # 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.83.0" +rust-version = "1.87.0" [profile.release] codegen-units = 1 diff --git a/resources/Dockerfile b/resources/Dockerfile index ca527857f..a650c4821 100644 --- a/resources/Dockerfile +++ b/resources/Dockerfile @@ -8,7 +8,7 @@ FROM ubuntu:24.04 AS dev ARG TARGETARCH -ARG RUST_TOOLCHAIN="1.83.0" +ARG RUST_TOOLCHAIN="1.87.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 db560d529..3349afa9d 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="20250412-0" +CTR_IMAGE_VERSION="20250807-0" : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}" DOCKER_RUNTIME="docker"