summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-07-02 14:40:06 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-07-02 14:40:06 +0000
commit832bac6e5f5de5c976352a2e05ade5bf7e1a4ac4 (patch)
tree7ed47ef5f9d09dd68105ff9453a426f06c42bb58
parentMerge https://gitlab.com/inkscape/inkscape into selectable-knots (diff)
parentSpecify CI test stage platform dependencies (diff)
downloadinkscape-832bac6e5f5de5c976352a2e05ade5bf7e1a4ac4.tar.gz
inkscape-832bac6e5f5de5c976352a2e05ade5bf7e1a4ac4.zip
Merge https://gitlab.com/inkscape/inkscape into selectable-knots
-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