AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Install Rust & cargo from Debian for x86_test* images

Browse Source 
Also build deqp-runner once in x86_test-base instead of separately in
x86_test-{gl,vk}.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
This commit is contained in:
Michel Dänzer
2021-03-22 17:02:50 +01:00
committed by Marge Bot
parent b0ab534c2d
commit db4ddced5f
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+3 -3
View File
@@ -397,7 +397,7 @@ android_build:
x86_test-base:
extends: x86_build-base
variables:
MESA_IMAGE_TAG: &x86_test-base "2021-03-31-librenderdoc"
MESA_IMAGE_TAG: &x86_test-base "2021-03-31-cargo"
.use-x86_test-base:
extends:
@@ -413,13 +413,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-llvm-spirv"
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-cargo"
# Debian 11 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-librenderdoc"
MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-cargo"
# Debian 11 based ARM build image
arm_build: