summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorTim Sheridan <tghs@tghs.net>2017-07-02 02:36:51 +0000
committerTim Sheridan <tghs@tghs.net>2017-07-02 02:41:46 +0000
commit6984b49a745784627f3b1ee3bb3c1b1513b37e77 (patch)
tree1503dcba49a187de90679052507f684cd0d4ad9d /.gitlab-ci.yml
parentWhen running without installing, extensions will spawn correct Inkscape (diff)
downloadinkscape-6984b49a745784627f3b1ee3bb3c1b1513b37e77.tar.gz
inkscape-6984b49a745784627f3b1ee3bb3c1b1513b37e77.zip
Specify CI test stage platform dependencies
If dependencies between a platform's build and test jobs are not specified, then artifacts from all platforms' build jobs are passed to each test job. This is not what we want! https://docs.gitlab.com/ee/ci/yaml/#dependencies
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35e8139b0..cb7f0173c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ cache:
- ccache/
# Building inkscape
-inkscape:
+inkscape:linux:
stage: build
before_script:
# CCache Config
@@ -56,6 +56,7 @@ inkscape:mac:
paths:
- build/
allow_failure: true
+
# This job is a static analysis build by clang.
# It takes MORE THAN 3 HOURS, and depending on worker sometimes 4 hours.
# Make sure the timeout of the build is big enough
@@ -73,8 +74,10 @@ clang:
paths:
- scan/
-test:
+test:linux:
stage: test
+ dependencies:
+ - inkscape:linux
script:
- cd build
- make test