summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml26
-rw-r--r--.gitlab-ci/meson-build.sh29
2 files changed, 30 insertions, 25 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0feba19703e..1b448b34599 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,31 +79,7 @@ debian:
.meson-build:
extends: .build
script:
- # We need to control the version of llvm-config we're using, so we'll
- # generate a native file to do so. This requires meson >=0.49
- - if test -n "$LLVM_VERSION"; then
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
- echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file;
- $LLVM_CONFIG --version;
- else
- touch native.file;
- fi
- - meson --version
- - meson _build
- --native-file=native.file
- -D buildtype=debug
- -D build-tests=true
- -D libunwind=${UNWIND}
- ${DRI_LOADERS}
- -D dri-drivers=${DRI_DRIVERS:-[]}
- ${GALLIUM_ST}
- -D gallium-drivers=${GALLIUM_DRIVERS:-[]}
- -D vulkan-drivers=${VULKAN_DRIVERS:-[]}
- -D I-love-half-baked-turnips=true
- - cd _build
- - meson configure
- - ninja -j4
- - LC_ALL=C.UTF-8 ninja test
+ - .gitlab-ci/meson-build.sh
.scons-build:
extends: .build
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
new file mode 100644
index 00000000000..ac41eb872b9
--- /dev/null
+++ b/.gitlab-ci/meson-build.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+set -e
+set -o xtrace
+
+# We need to control the version of llvm-config we're using, so we'll
+# generate a native file to do so. This requires meson >=0.49
+if test -n "$LLVM_VERSION"; then
+ LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+ echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file
+ $LLVM_CONFIG --version
+else
+ touch native.file
+fi
+
+meson _build --native-file=native.file \
+ -D buildtype=debug \
+ -D build-tests=true \
+ -D libunwind=${UNWIND} \
+ ${DRI_LOADERS} \
+ -D dri-drivers=${DRI_DRIVERS:-[]} \
+ ${GALLIUM_ST} \
+ -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
+ -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
+ -D I-love-half-baked-turnips=true
+cd _build
+meson configure
+ninja -j4
+LC_ALL=C.UTF-8 ninja test