Mesa (master): CI: Collapse SCons & meson-misc stages into one
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 3 02:21:59 UTC 2020
Module: Mesa
Branch: master
Commit: 4d7c84805362adf96a73cc7c630714e920345067
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4d7c84805362adf96a73cc7c630714e920345067
Author: Daniel Stone <daniels at collabora.com>
Date: Wed Dec 2 13:50:38 2020 +0000
CI: Collapse SCons & meson-misc stages into one
This is now called 'build-misc'.
Signed-off-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Acked-by: Eric Anholt <eric at anholt.net>
Acked-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7873>
---
.gitlab-ci.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ecc639af7e..46cb183b76b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,7 @@ stages:
- git-archive
- deploy
- meson-x86_64
- - scons
- - meson-misc
+ - build-misc
- llvmpipe
- softpipe
- freedreno
@@ -556,7 +555,7 @@ sanity:
extends:
- .build-linux
- .use-x86_build
- stage: scons
+ stage: build-misc
script:
- env SCONSFLAGS="-j${FDO_CI_CONCURRENT:-4}" .gitlab-ci/scons-build.sh
@@ -718,7 +717,7 @@ meson-android:
.meson-cross:
extends:
- .meson-build
- stage: meson-misc
+ stage: build-misc
variables:
UNWIND: "disabled"
DRI_LOADERS: >
@@ -807,7 +806,7 @@ meson-windows-vs2019:
extends:
- .build-windows
- .use-windows_build_vs2019
- stage: meson-misc
+ stage: build-misc
script:
- . .\.gitlab-ci\windows\mesa_build.ps1
artifacts:
@@ -935,7 +934,7 @@ meson-ppc64el:
meson-mingw32-x86_64:
extends: .meson-build
- stage: meson-misc
+ stage: build-misc
variables:
UNWIND: "disabled"
DRI_DRIVERS: ""
More information about the mesa-commit
mailing list