gitlab-ci: Switch the meson-main build type to debugoptimized.

Now that we're running the drivers we build, building with
optimization is important for keeping our runtime down.  Shaves about
4 minutes of runtime off of GLES2 CTS of llvmpipe at 64x64.

v2: Only switch meson-main until we enable CTS for other builds
    on request by Michel.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9861f7590f45c1f3ca41cfe5abad3ee059c03879..aca5d7624d08238d89fcdc01ca47c7b67eaad314 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,6 +175,7 @@ meson-main:
       -D osmesa=gallium
       -D tools=all
     MESON_SHADERDB: "true"
+    BUILDTYPE: "debugoptimized"
 
 meson-clover:
   extends: .meson-build

diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index 42aed0e91c51974653a4a39f5f1c1b670c9e83bc..c2efd2aeedf5f4c36459b3980cd33cc189c77408 100755 (executable)
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -19,7 +19,7 @@ meson _build --native-file=native.file \
       ${CROSS+--cross /cross_file-$CROSS.txt} \
       -D prefix=`pwd`/install \
       -D libdir=lib \
-      -D buildtype=debug \
+      -D buildtype=${BUILDTYPE:-debug} \
       -D build-tests=true \
       -D libunwind=${UNWIND} \
       ${DRI_LOADERS} \