diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh index 920925e05f3..50b01382483 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.66.0 +# Rusticl requires at least Rust 1.66.0 and NAK requires 1.73.0 # # Also, pick a specific snapshot from rustup so the compiler doesn't drift on # us. -RUST_VERSION=1.66.1-2023-01-10 +RUST_VERSION=1.73.0-2023-10-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/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh index a3e190b71e2..c53bf1f0a1e 100644 --- a/.gitlab-ci/container/debian/x86_64_build-base.sh +++ b/.gitlab-ci/container/debian/x86_64_build-base.sh @@ -81,8 +81,8 @@ apt-get install -y --no-remove "${DEPS[@]}" "${EPHEMERAL[@]}" \ # Needed for ci-fairy, this revision is able to upload files to S3 pip3 install --break-system-packages git+http://gitlab.freedesktop.org/freedesktop/ci-templates@ffe4d1b10aab7534489f0c4bbc4c5899df17d3f2 -# We need at least 1.2 for Rust's `debug_assertions` -pip3 install --break-system-packages meson==1.2.0 +# We need at least 1.3 for stable Rust support +pip3 install --break-system-packages 'meson @ git+https://github.com/mesonbuild/meson.git@cddf2e9d872ebbc673d2595bc176a0572d258222' . .gitlab-ci/container/build-rust.sh diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 4ebcb90eeba..ace3bce39d9 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -7,7 +7,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2023-10-31-virglrenderer" + DEBIAN_BASE_TAG: "2023-11-13-nak-v2" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-10-30-ci-improv"