fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gitlab-ci: Prune all SCons jobs except scons-win64, and allows failures.

Browse source 
Based on the discussion in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4352

Reviewed-by: Daniel Stone <daniels@collabora.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4363>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4363>
This commit is contained in:
Jose Fonseca 2020-03-28 10:36:28 +00:00 • committed by Marge Bot
parent 3935a729d9
commit 27d58a1c20
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.gitlab-ci.yml
View file

@ -437,8 +437,9 @@ meson-clang:
scons-win64: scons-win64:
extends: .scons-build extends: .scons-build
variables: variables:
SCONS_TARGET: platform=windows machine=x86_64 SCONS_TARGET: platform=windows machine=x86_64 debug=1
SCONS_CHECK_COMMAND: "true" SCONS_CHECK_COMMAND: "true"
allow_failure: true
meson-clover: meson-clover:
extends: .meson-build extends: .meson-build
@ -558,22 +559,6 @@ meson-mingw32-x86_64:
-Dosmesa=gallium -Dosmesa=gallium
--cross-file=.gitlab-ci/x86_64-w64-mingw32 --cross-file=.gitlab-ci/x86_64-w64-mingw32
scons:
extends: .scons-build
variables:
SCONS_TARGET: "llvm=1"
SCONS_CHECK_COMMAND: "scons force_scons=1 ${SCONS_TARGET} check"
script:
- SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh
- LLVM_VERSION=9 .gitlab-ci/scons-build.sh
scons-old-llvm:
extends:
- scons
- .use-x86_build_old
script:
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
.test: .test:
extends: extends:
- .ci-run-policy - .ci-run-policy