From 08d3d6ba5d63936e45b2152f46a77961d5bd75d9 Mon Sep 17 00:00:00 2001 From: Pat Somaru Date: Mon, 2 Dec 2024 10:41:48 -0500 Subject: [PATCH] bump pinned rust ver, use rustup for rust on ci --- .github/actions/install-deps-action/action.yml | 7 ++++++- rust-toolchain.toml | 4 +--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/actions/install-deps-action/action.yml b/.github/actions/install-deps-action/action.yml index 057685602..3083acd16 100644 --- a/.github/actions/install-deps-action/action.yml +++ b/.github/actions/install-deps-action/action.yml @@ -23,7 +23,12 @@ runs: linux-headers-generic linux-tools-common linux-tools-generic make \ ninja-build pahole pkg-config python3-dev python3-pip python3-requests \ qemu-kvm rsync stress-ng udev zstd libseccomp-dev libcap-ng-dev \ - llvm clang python3-full curl meson bpftrace cargo rustc dwarves + llvm clang python3-full curl meson bpftrace dwarves rustup + shell: bash + + # ensure some toolchain is installed + - run: | + rustup default nightly shell: bash # virtme-ng diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a70be64fc..fa04a7dc9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,2 @@ [toolchain] -channel = "nightly-2024-09-10" -components = [ "rustfmt", "rustc-dev" ] -profile = "minimal" +channel = "nightly-2024-11-26"