From 86dd5dd8530225019136b3d4f8a37d7cebd11e96 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Wed, 24 May 2023 17:31:12 +0200 Subject: [PATCH] rusticl: bump rust req to 1.60 We need this rustc bugfix: https://github.com/rust-lang/rust/commit/6466f89fc5df36b4c841fca9d10e27c50dd744b5 Cc: mesa-stable Signed-off-by: Karol Herbst Part-of: --- .gitlab-ci/container/build-rust.sh | 6 +++--- .gitlab-ci/image-tags.yml | 2 +- docs/rusticl.rst | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index 8435430..8abdc95 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -11,11 +11,11 @@ set -ex mkdir -p "$HOME"/.cargo ln -s /usr/local/bin "$HOME"/.cargo/bin -# Rusticl requires at least Rust 1.59.0 +# Rusticl requires at least Rust 1.60.0 # -# Also, oick a specific snapshot from rustup so the compiler doesn't drift on +# Also, pick a specific snapshot from rustup so the compiler doesn't drift on # us. -RUST_VERSION=1.59.0-2022-02-24 +RUST_VERSION=1.60.0-2022-04-07 # For rust in Mesa, we use rustup to install. This lets us pick an arbitrary # version of the compiler, rather than whatever the container's Debian comes diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index dc949a3..b1871d9 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2023-06-05-virgl-crosvm" + DEBIAN_BASE_TAG: "2023-06-07-rust-bump" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-05-25-bookworm" diff --git a/docs/rusticl.rst b/docs/rusticl.rst index c6f4fc5..d33d138 100644 --- a/docs/rusticl.rst +++ b/docs/rusticl.rst @@ -18,7 +18,7 @@ To build Rusticl you need to satisfy the following build dependencies: The minimum versions to build Rusticl are: -- Rust: 1.59 +- Rust: 1.60 - Meson: 1.0.0 - Bindgen: 0.58.0 - LLVM: 11.0.0 (recommended: 15.0.0) -- 2.7.4