diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 5a117f9c310..84d98d7d265 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,10 +19,10 @@ include: - .gitlab-ci/conditional-build-image-tags.yml variables: - DEBIAN_BUILD_BASE_TAG: "20250430-imgui.2" + DEBIAN_BUILD_BASE_TAG: "20250528-rust-1.85" DEBIAN_BUILD_TAG: "20260430-imgui.2" - DEBIAN_TEST_BASE_TAG: "20260502-virgl" + DEBIAN_TEST_BASE_TAG: "20250528-rust-1.85" DEBIAN_TEST_ANDROID_TAG: "20260526-angle-a7" DEBIAN_TEST_GL_TAG: "20260526-angle-a7" DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev" diff --git a/clippy.toml b/clippy.toml index 66e012058f5..f2c68695e07 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,2 +1,2 @@ # Keep this in sync with the `rustc.version()` check in meson.build -msrv = "1.82.0" +msrv = "1.85.0" diff --git a/meson.build b/meson.build index 247df3e0f03..352569d45fe 100644 --- a/meson.build +++ b/meson.build @@ -844,8 +844,8 @@ if with_gallium_rusticl or with_nouveau_vk or with_tools.contains('etnaviv') or rust = import('rust') # Keep this in sync with the `msrv` in clippy.toml - if rustc.version().version_compare('< 1.82') - error('Mesa requires Rust 1.82.0 or newer') + if rustc.version().version_compare('< 1.85') + error('Mesa requires Rust 1.85.0 or newer') endif # bindgen 0.71 is the first version that knows about `editions`