From 8084a8ca6c96ca9bcc5beb736f60946caa167b6d Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Mon, 12 Feb 2018 16:26:02 +0100
Subject: [PATCH] CI: Single job
---
.gitlab-ci.yml | 49 +++++++++++++++++++++++++------------------------
1 file changed, 25 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4adaa105..ae1c2ecde 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,16 +55,16 @@ before_script:
- make install
- cd ../..
-wolf_build:
+wolf_build_and_test:
stage: build
- cache:
- #key: "$CI_COMMIT_REF_NAME"
- untracked: true
- paths:
- - build
- - bin
- - lib
- policy: push
+# cache:
+# #key: "$CI_COMMIT_REF_NAME"
+# untracked: true
+# paths:
+# - build
+# - bin
+# - lib
+# policy: push
except:
- master
script:
@@ -73,19 +73,20 @@ wolf_build:
- ls # we can check whether the directory was already full
- cmake -DCMAKE_BUILD_TYPE=release ..
- make
-
-wolf_test:
- stage: test
- cache:
- #key: "$CI_COMMIT_REF_NAME"
- untracked: true
- paths:
- - build
- - bin
- - lib
- policy: pull
- except:
- - master
- script:
- - cd build
- ctest
+
+#wolf_test:
+# stage: test
+# cache:
+# #key: "$CI_COMMIT_REF_NAME"
+# untracked: true
+# paths:
+# - build
+# - bin
+# - lib
+# policy: pull
+# except:
+# - master
+# script:
+# - cd build
+# - ctest
--
GitLab