drm: Branch 'master'

 .gitlab-ci.yml |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6d3f06f6660ecec94b5ae257e31aa5fa469c79cd
Author: Eric Engestrom <[email protected]>
Date:   Tue Dec 17 22:29:11 2019 +0000

    gitlab-ci: rename build folder to simply `build`
    
    Signed-off-by: Eric Engestrom <[email protected]>
    Reviewed-by: Lucas De Marchi <[email protected]>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c685a2bb..a6e3bd4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ debian:
   variables:
     GIT_DEPTH: 10
   script:
-    - meson _build
+    - meson build
         -D amdgpu=true
         -D cairo-tests=true
         -D etnaviv=true
@@ -75,13 +75,13 @@ debian:
         -D vc4=true
         -D vmwgfx=true
         ${CROSS+--cross /cross_file-$CROSS.txt}
-    - ninja -C _build
-    - ninja -C _build test
-    - DESTDIR=$PWD/install ninja -C _build install
+    - ninja -C build
+    - ninja -C build test
+    - DESTDIR=$PWD/install ninja -C build install
   artifacts:
     when: on_failure
     paths:
-      - _build/meson-logs/*
+      - build/meson-logs/*
 
 meson-x86_64:
   extends:


--