From 57c0bdf63819e67550e95e1e7db5a6d4643ffa9f Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <bochecha@daitauha.fr>
Date: Mon, 10 Sep 2018 14:01:43 +0200
Subject: ci: Build with srcdir != builddir

This should prevent issues like the one fixed in the previous commit to
creep back in.
---
 .gitlab-ci.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1093ad63..42d7a6c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,14 +40,17 @@ stages:
     - export CARGO_HOME="${PWD}/.cargo_cache"
   script:
     - rustc --version && cargo --version
-    - ./autogen.sh --enable-gtk-doc --enable-vala
-    - make check
+    - |
+      mkdir _build
+      cd _build
+      ../autogen.sh --enable-gtk-doc --enable-vala
+      make check
 
   artifacts:
     when: on_failure
     paths:
-      - tests/*.log
-      - tests/output/
+      - _build/tests/*.log
+      - _build/tests/output/
 
   cache:
     # JOB_NAME - Each job will have it's own cache
@@ -55,7 +58,7 @@ stages:
     # ^ Keep diffrerent caches for each branch
     key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
-      - target/
+      - _build/target/
       - .cargo_cache/
       - ccache/
 
@@ -141,8 +144,11 @@ tarball:
     LIBRSVG_DEBUG: "yes"
   script:
     - rustc --version && cargo --version
-    - ./autogen.sh --enable-gtk-doc --enable-vala
-    - make distcheck DESTDIR=/tmp/distcheck
+    - |
+      mkdir _build
+      cd _build
+      ../autogen.sh --enable-gtk-doc --enable-vala
+      make distcheck DESTDIR=/tmp/distcheck
   <<: *stage_2
 
 # STAGE 2 CROSS DISTRO TESTS
-- 
cgit v1.2.1