summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2019-03-20 15:58:31 +0100
committerMichel Dänzer <michel@daenzer.net>2019-03-21 09:55:08 +0100
commita2cce701e6dc94fb7c57195460d192645e125c90 (patch)
treea2032470d157cd5eb9d11505551ab17c21dc5fde /.gitlab-ci.yml
parentdb07f0554a83bef534525c47d2dd3a2c3fcbf8b9 (diff)
gitlab-ci: List some longer-running jobs before others of the same stage
This increases the chance of them running earlier, which can have an impact on the total duration of the pipeline. v2: * Minor style fix-up to moved comment (Eric Anholt) Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml94
1 files changed, 47 insertions, 47 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28840e055a0..40d6a714101 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,6 +123,53 @@ ubuntu:
- scons $SCONS_TARGET
- eval $SCONS_CHECK_COMMAND
+autotools:
+ extends: .build
+ variables:
+ MAKEFLAGS: "-j4"
+ LLVM_CONFIG: llvm-config-7
+ script:
+ - mkdir build
+ - cd build
+ - ../autogen.sh
+ --enable-autotools
+ --enable-debug
+ --disable-llvm-shared-libs
+ - make
+ - make check
+
+# NOTE: Building SWR is 2x (yes two) times slower than all the other
+# gallium drivers combined.
+# Start this early so that it doesn't limit the total run time.
+meson-gallium-swr:
+ extends: .meson-build
+ variables:
+ UNWIND: "true"
+ DRI_LOADERS: >
+ -D glx=disabled
+ -D egl=false
+ -D gbm=false
+ GALLIUM_ST: >
+ -D dri3=false
+ -D gallium-vdpau=false
+ -D gallium-xvmc=false
+ -D gallium-omx=disabled
+ -D gallium-va=false
+ -D gallium-xa=false
+ -D gallium-nine=false
+ -D gallium-opencl=disabled
+ GALLIUM_DRIVERS: "swr"
+ LLVM_VERSION: "6.0"
+
+meson-clang:
+ extends: .meson-build
+ variables:
+ UNWIND: "true"
+ DRI_DRIVERS: "auto"
+ GALLIUM_DRIVERS: "auto"
+ CC: clang-7
+ CXX: clang++-7
+
meson-vulkan:
extends: .meson-build
variables:
@@ -185,38 +232,6 @@ meson-glvnd:
-D gallium-nine=false
-D gallium-opencl=disabled
-meson-clang:
- extends: .meson-build
- variables:
- UNWIND: "true"
- DRI_DRIVERS: "auto"
- GALLIUM_DRIVERS: "auto"
- CC: clang-7
- CXX: clang++-7
-
-# NOTE: Building SWR is 2x (yes two) times slower than all the other
-# gallium drivers combined.
-# Start this early so that it doesn't hunder the run time.
-meson-gallium-swr:
- extends: .meson-build
- variables:
- UNWIND: "true"
- DRI_LOADERS: >
- -D glx=disabled
- -D egl=false
- -D gbm=false
- GALLIUM_ST: >
- -D dri3=false
- -D gallium-vdpau=false
- -D gallium-xvmc=false
- -D gallium-omx=disabled
- -D gallium-va=false
- -D gallium-xa=false
- -D gallium-nine=false
- -D gallium-opencl=disabled
- GALLIUM_DRIVERS: "swr"
- LLVM_VERSION: "6.0"
-
meson-gallium-radeonsi:
extends: .meson-build
variables:
@@ -303,21 +318,6 @@ meson-gallium-st-other:
GALLIUM_DRIVERS: "nouveau,swrast"
LLVM_VERSION: "5.0"
-autotools:
- extends: .build
- variables:
- MAKEFLAGS: "-j4"
- LLVM_CONFIG: llvm-config-7
- script:
- - mkdir build
- - cd build
- - ../autogen.sh
- --enable-autotools
- --enable-debug
- --disable-llvm-shared-libs
- - make
- - make check
-
scons-nollvm:
extends: .scons-build
variables: