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@collabora.com> Acked-by: Gert Wollny <gert.wollny@collabora.com> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11320>
This commit is contained in:
parent
33d9954bc1
commit
0da2ebff27
|
@ -425,7 +425,7 @@ debian/x86_test-gl:
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
|
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"
|
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 11 based x86 test image for VK
|
||||||
debian/x86_test-vk:
|
debian/x86_test-vk:
|
||||||
|
@ -480,7 +480,7 @@ fedora/x86_build:
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: fetch
|
GIT_STRATEGY: fetch
|
||||||
KERNEL_URL: *kernel-rootfs-url
|
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}"
|
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
|
||||||
script:
|
script:
|
||||||
- .gitlab-ci/container/lava_build.sh
|
- .gitlab-ci/container/lava_build.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
|
# version of the compiler, rather than whatever the container's Debian comes
|
||||||
# with.
|
# 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.
|
# snapshot from rustup so the compiler doesn't drift on us.
|
||||||
wget https://sh.rustup.rs -O - | \
|
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
|
# 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.
|
# linking in cross builds, but doesn't know what you want to use for system cc.
|
||||||
|
|
|
@ -12,7 +12,6 @@ STABLE_EPHEMERAL=" \
|
||||||
bc \
|
bc \
|
||||||
bison \
|
bison \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
cargo \
|
|
||||||
ccache \
|
ccache \
|
||||||
clang-11 \
|
clang-11 \
|
||||||
cmake \
|
cmake \
|
||||||
|
@ -101,6 +100,7 @@ PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON -DPIGLIT_BUILD_DMA_BUF_TESTS=ON" . .gitl
|
||||||
|
|
||||||
############### Build Crosvm
|
############### Build Crosvm
|
||||||
|
|
||||||
|
. .gitlab-ci/container/build-rust.sh
|
||||||
. .gitlab-ci/container/build-crosvm.sh
|
. .gitlab-ci/container/build-crosvm.sh
|
||||||
rm -rf /root/.cargo
|
rm -rf /root/.cargo
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue