diff --git a/.gitlab-ci/conditional-build-image-tags.yml b/.gitlab-ci/conditional-build-image-tags.yml index 860dc2b7479..03de348ff30 100644 --- a/.gitlab-ci/conditional-build-image-tags.yml +++ b/.gitlab-ci/conditional-build-image-tags.yml @@ -1,6 +1,6 @@ variables: CONDITIONAL_BUILD_ANGLE_TAG: f62910e55be46e37cc867d037e4a8121 - CONDITIONAL_BUILD_CROSVM_TAG: bb7f75d912ef43be8c9204385d79820a + CONDITIONAL_BUILD_CROSVM_TAG: 0f59350b1052bdbb28b65a832b494377 CONDITIONAL_BUILD_FLUSTER_TAG: 3bc3afd7468e106afcbfd569a85f34f9 CONDITIONAL_BUILD_PIGLIT_TAG: 827b708ab7309721395ea28cec512968 CONDITIONAL_BUILD_VKD3D_PROTON_TAG: 31e89afb27aa6d9017c48b322c44df3e diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index eec6ec6dca4..1b48bf410cc 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=e27efaf8f4bdc4a47d1e99cc44d2b6908b6f36bd +CROSVM_VERSION=4a6b4316155742fbfa1be7087c2ee578cfee884d 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=7570167549358ce77b8d4774041b4a77c72a021c +VIRGLRENDERER_VERSION=06d43ce974b664f9dc521b706a0ad7f91dbf2866 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 23fede2564b..d96d75fb94e 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.78.0-2024-05-02 +RUST_VERSION=1.81.0-2024-09-05 # 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 2bf4b3f6846..96f4e921928 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: "20250611-rust" + DEBIAN_BASE_TAG: "20250618-crosvmvirgl" DEBIAN_BUILD_TAG: "20250611-rust"