summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2017-07-20 22:25:40 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2017-07-20 22:25:40 +0000
commit734bece3601812301f295e47db6ed40c49f90466 (patch)
tree3ad6bcc54029018d5f4c8159be2bb715147e9e4c
parentMerge branch 'master' of gitlab.com:inkscape/inkscape (diff)
downloadinkscape-734bece3601812301f295e47db6ed40c49f90466.tar.gz
inkscape-734bece3601812301f295e47db6ed40c49f90466.zip
Try to fix CI
-rw-r--r--.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b4356059..86f69b469 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,9 +19,10 @@ inkscape:linux:
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache
script:
- - mkdir -p build
+ - mkdir -p build/conf
+ - ln -s . share/inkscape
- cd build
- - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug
+ - cmake .. -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../
- make -j3
- make -j3 tests
- cd ..
@@ -84,7 +85,6 @@ test:linux:
- inkscape:linux
script:
- cd build
- - make install
- make test
# uploads the clang scan to user.gitlab.io/inkscape/