Mesa (main): ci: Increase the default Rust toolchain version

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0da2ebff274ba9e4c34da3ec3af5ee9e80bdb5f2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0da2ebff274ba9e4c34da3ec3af5ee9e80bdb5f2

Author: Corentin Noël <corentin.noel at collabora.com>
Date:   Fri Jul  9 11:40:46 2021 +0200

ci: Increase the default Rust toolchain version

We need a newer Rust toolchain to be able to build the latest crosvm.

Signed-off-by: Corentin Noël <corentin.noel at collabora.com>
Acked-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11320>

---

 .gitlab-ci.yml                             | 4 ++--
 .gitlab-ci/container/build-rust.sh         | 4 ++--
 .gitlab-ci/container/debian/x86_test-gl.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a79b244b01..80c6cd10b26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -425,7 +425,7 @@ debian/x86_test-gl:
   variables:
     FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2"
-    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-07-30-vk-gl-cts-1.2.7.0"
+    MESA_IMAGE_TAG: &debian-x86_test-gl "2021-08-02-rust-bump"
 
 # Debian 11 based x86 test image for VK
 debian/x86_test-vk:
@@ -480,7 +480,7 @@ fedora/x86_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-07-30-vk-gl-cts-1.2.7.0"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-08-02-rust-bump"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
diff --git a/.gitlab-ci/container/build-rust.sh b/.gitlab-ci/container/build-rust.sh
index 7085448d418..57f1e7e5d5d 100644
--- a/.gitlab-ci/container/build-rust.sh
+++ b/.gitlab-ci/container/build-rust.sh
@@ -15,10 +15,10 @@ ln -s /usr/local/bin $HOME/.cargo/bin
 # version of the compiler, rather than whatever the container's Debian comes
 # with.
 #
-# Pick the rust compiler (1.41) available in Debian stable, and pick a specific
+# Pick the rust compiler (1.48) available in Debian stable, and pick a specific
 # snapshot from rustup so the compiler doesn't drift on us.
 wget https://sh.rustup.rs -O - | \
-    sh -s -- -y --default-toolchain 1.41.1-2020-02-27
+    sh -s -- -y --default-toolchain 1.49.0-2020-12-31
 
 # Set up a config script for cross compiling -- cargo needs your system cc for
 # linking in cross builds, but doesn't know what you want to use for system cc.
diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh
index 05b1b9b9925..ce9bec8b91a 100644
--- a/.gitlab-ci/container/debian/x86_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_test-gl.sh
@@ -12,7 +12,6 @@ STABLE_EPHEMERAL=" \
       bc \
       bison \
       bzip2 \
-      cargo \
       ccache \
       clang-11 \
       cmake \
@@ -101,6 +100,7 @@ PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitl
 
 ############### Build Crosvm
 
+. .gitlab-ci/container/build-rust.sh
 . .gitlab-ci/container/build-crosvm.sh
 rm -rf /root/.cargo