summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-09-13 11:13:12 +0200
committerMichel Dänzer <michel@daenzer.net>2019-09-16 12:51:35 +0200
commitcccb68b407c649631d7a368878b072f9adefbf03 (patch)
treef92901899b2643bf757989fae0155c5221d33020 /.gitlab-ci.yml
parent128581d0d840530bfe75b471167b742492f91a09 (diff)
gitlab-ci: Move dependencies/needs for meson-main job to .deqp-test
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8705ede4713..e102d3f3bff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -350,6 +350,9 @@ scons-llvm:
name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
paths:
- results/
+ dependencies:
+ - meson-main
+ needs: [meson-main]
test-llvmpipe-gles2:
parallel: 4
@@ -359,9 +362,6 @@ test-llvmpipe-gles2:
LIBGL_ALWAYS_SOFTWARE: "true"
DEQP_RENDERER_MATCH: "llvmpipe"
extends: .deqp-test
- dependencies:
- - meson-main
- needs: [meson-main]
test-softpipe-gles2:
extends: test-llvmpipe-gles2
@@ -383,9 +383,6 @@ test-softpipe-gles3-limited:
CI_NODE_INDEX: 1
CI_NODE_TOTAL: 10
extends: .deqp-test
- dependencies:
- - meson-main
- needs: [meson-main]
arm64_a630_gles2:
extends: .deqp-test