diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index e4c6f81cb71..528b4980f7b 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,7 +1,7 @@ variables: CONDITIONAL_BUILD_ANDROID_CTS_TAG: b018634d732f438027ec58c0383615e7 CONDITIONAL_BUILD_ANGLE_TAG: f62910e55be46e37cc867d037e4a8121 - CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377 + CONDITIONAL_BUILD_CROSVM_TAG: bb7f75d912ef43be8c9204385d79820a CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9 CONDITIONAL_BUILD_PIGLIT_TAG: 827b708ab7309721395ea28cec512968 CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 82cadf35246e64a8228bf759c9c19e5b diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 1b48bf410cc..eec6ec6dca4 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -16,13 +16,13 @@ section_start crosvm "Building crosvm" git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -CROSVM_VERSION=4a6b4316155742fbfa1be7087c2ee578cfee884d +CROSVM_VERSION=e27efaf8f4bdc4a47d1e99cc44d2b6908b6f36bd git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=06d43ce974b664f9dc521b706a0ad7f91dbf2866 +VIRGLRENDERER_VERSION=7570167549358ce77b8d4774041b4a77c72a021c rm -rf third_party/virglrenderer git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index d96d75fb94e..23fede2564b 100644 --- a/.gitlab-ci/container/build-rust.sh +++ b/.gitlab-ci/container/build-rust.sh @@ -8,7 +8,7 @@ set -ex section_start rust "Building Rust toolchain" # Pick a specific snapshot from rustup so the compiler doesn't drift on us. -RUST_VERSION=1.81.0-2024-09-05 +RUST_VERSION=1.78.0-2024-05-02 # 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 0efa58fa9ed..856fc671ae6 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -19,7 +19,7 @@ include: - .gitlab-ci/conditional-build-image-tags.yml variables: - DEBIAN_BASE_TAG: "20250715-apitrace" + DEBIAN_BASE_TAG: "20250925-rust-252" DEBIAN_BUILD_TAG: "20250710-libwayland"