summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jpetridis@gnome.org>2020-10-08 08:52:27 +0000
committerJordan Petridis <jpetridis@gnome.org>2020-10-08 08:52:27 +0000
commitf3afbc0deb30d0927e456845088b68c6692eea60 (patch)
tree5418bca8493a1c6298e0b7824fbb3b9320bd64b7
parented250db7f4d04636c9e9102a088d2e0a23e56340 (diff)
parent30c0cb123d8b5e72bf58ecd19c2ee63029ec642a (diff)
downloadlibrsvg-f3afbc0deb30d0927e456845088b68c6692eea60.tar.gz
Merge branch 'ci-mods' into 'master'
Let the CI build with srcdir != builddir again See merge request GNOME/librsvg!400
-rw-r--r--.gitlab-ci.yml13
1 files changed, 9 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f299169d..d7f2e3f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,13 +110,16 @@ cargo_test:
- job: cargo_test
artifacts: false
script:
- - sudo ./autogen.sh --enable-gtk-doc --enable-vala
+ - mkdir -p _build
+ - cd _build
+ - sudo ../autogen.sh --enable-gtk-doc --enable-vala
- sudo -E make
- sudo -E make check
artifacts:
- when: 'always'
+ when: 'on_failure'
paths:
- - tests/output/*-diff.png
+ - _build/tests/*.log
+ - _build/tests/output
expire_in: 1 day
rules:
- if: '$CI_PIPELINE_SOURCE == "push"'
@@ -150,7 +153,9 @@ debian:testing:
- export PATH=$PATH:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0
script:
# TODO: delete after sudo is no longer needed
- - ./autogen.sh --enable-gtk-doc --enable-vala
+ - mkdir -p _build
+ - cd _build
+ - ../autogen.sh --enable-gtk-doc --enable-vala
- make
- make check