From 4d7c84805362adf96a73cc7c630714e920345067 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Wed, 2 Dec 2020 13:50:38 +0000
Subject: [PATCH] CI: Collapse SCons & meson-misc stages into one
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is now called 'build-misc'.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <mdaenzer@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: ""