diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index b21e4fcc856..281fc8b932a 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -9,15 +9,17 @@ section_start rust "Building Rust toolchain" # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: +# ALPINE_X86_64_BUILD_TAG # DEBIAN_BUILD_BASE_TAG # DEBIAN_TEST_BASE_TAG +# FEDORA_X86_64_BUILD_TAG MINIMUM_SUPPORTED_RUST_VERSION=$(python3 -c 'import tomllib; print(tomllib.load(open("clippy.toml", "rb"))["msrv"])') # This version number can be bumped freely, to benefit from the latest # diagnostics in CI `build-only` jobs, and for building external CI # components. -LATEST_RUST_VERSION=1.90.0 +LATEST_RUST_VERSION=1.96.0 # 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 3d8c41a1c06..8be9b3a83d2 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,18 +19,18 @@ include: - .gitlab-ci/conditional-build-image-tags.yml variables: - DEBIAN_BUILD_BASE_TAG: "20260529-rust-1.85" + DEBIAN_BUILD_BASE_TAG: "20260604-rust196" DEBIAN_BUILD_TAG: "20260504-screenshot" - DEBIAN_TEST_BASE_TAG: "20260529-rust-1.85" + DEBIAN_TEST_BASE_TAG: "20260604-rust196" DEBIAN_TEST_ANDROID_TAG: "20260602-angle-19" DEBIAN_TEST_GL_TAG: "20260609-vvl-2a" DEBIAN_TEST_VIDEO_TAG: "20260512-vkuprev" DEBIAN_TEST_VK_TAG: "20260604-vkd3d" - ALPINE_X86_64_BUILD_TAG: "20260429-libdrm" + ALPINE_X86_64_BUILD_TAG: "20260604-rust196" - FEDORA_X86_64_BUILD_TAG: "20260429-staticcpp" + FEDORA_X86_64_BUILD_TAG: "20260604-rust196" KERNEL_TAG: "v6.19-mesa-712d" KERNEL_REPO: "gfx-ci/linux"