diff options
| author | Jose Fonseca <[email protected]> | 2020-03-28 10:36:28 +0000 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-03-30 14:52:34 +0000 |
| commit | 27d58a1c20cc39a87fe36455f221f6bd4ef811c0 (patch) | |
| tree | 31ef7b6ea4ceed3e19a03806c11bdc366c043629 /.gitlab-ci.yml | |
| parent | 3935a729d998274ba78ab70e9eb6dd7dac2c2368 (diff) | |
gitlab-ci: Prune all SCons jobs except scons-win64, and allows failures.
Based on the discussion in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4352
Reviewed-by: Daniel Stone <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4363>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4363>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cf5f58f551..a8a29ed495b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -437,8 +437,9 @@ meson-clang: scons-win64: extends: .scons-build variables: - SCONS_TARGET: platform=windows machine=x86_64 + SCONS_TARGET: platform=windows machine=x86_64 debug=1 SCONS_CHECK_COMMAND: "true" + allow_failure: true meson-clover: extends: .meson-build @@ -558,22 +559,6 @@ meson-mingw32-x86_64: -Dosmesa=gallium --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: extends: - .ci-run-policy |