diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2019-05-03 10:49:43 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-05-08 16:59:02 +0000 |
| commit | cc2b3a99ccf035a084d768e5c5ffa81478d685c1 (patch) | |
| tree | 16b01e728b782ba25bd2a68092565329c2c4f9db /.gitlab-ci.yml | |
| parent | d0b9a7f0d72a37c7d8ba0452b922bd4621c7fa45 (diff) | |
gitlab-ci: Move meson job script to separate file
No functional change intended (except for no longer running meson
--version separately, as the version appears early in meson's output
anyway).
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 1 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 |