From da0f83af9adc6c7178f703970c3b73d0394cdef3 Mon Sep 17 00:00:00 2001
From: Mathieu Faverge <mathieu.faverge@inria.fr>
Date: Mon, 6 Jul 2020 16:50:14 +0200
Subject: [PATCH] Restore build directory
---
.gitlab-ci.yml | 2 +-
.gitlab/build.yml | 4 ++--
.gitlab/pages.yml | 4 ++--
.gitlab/test.yml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55172605..3c6f8358 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ stages:
before_script:
- git submodule update --init --recursive
- source .gitlab/env.sh
- - mkdir -p build-${VERSION}
+ - mkdir -p build
include:
- .gitlab/common.yml
diff --git a/.gitlab/build.yml b/.gitlab/build.yml
index a37e1bf0..ad5fb509 100644
--- a/.gitlab/build.yml
+++ b/.gitlab/build.yml
@@ -8,10 +8,10 @@
untracked: true
paths:
- install-${VERSION}
- - build-${VERSION}
+ - build
- spm-build-${VERSION}.log
script:
- - cd build-${VERSION}
+ - cd build
- cmake -DSPM_CI_VERSION=${VERSION}
-C ../.gitlab/ci-test-initial-cache.cmake ..
- make -j 4 | tee ../spm-build-${VERSION}.log
diff --git a/.gitlab/pages.yml b/.gitlab/pages.yml
index df11debb..c6d9d775 100644
--- a/.gitlab/pages.yml
+++ b/.gitlab/pages.yml
@@ -7,8 +7,8 @@ pages:
paths:
- public
script:
- - mkdir -p build-doc
- - cd build-doc
+ - mkdir -p build
+ - cd build
- cmake .. -DSPM_CI_VERSION=doc
-C ../.gitlab/ci-test-initial-cache.cmake
- make -j5
diff --git a/.gitlab/test.yml b/.gitlab/test.yml
index 6290fa9e..56444236 100644
--- a/.gitlab/test.yml
+++ b/.gitlab/test.yml
@@ -10,14 +10,14 @@
- spm-gcov-${VERSION}.log
script:
- source install-${VERSION}/bin/spm_env.sh
- - (cd build-${VERSION} &&
+ - (cd build &&
eval "ctest
$TESTS_RESTRICTION
-D ExperimentalTest
-D ExperimentalCoverage
-D ExperimentalSubmit
| tee -a ../spm-build-${VERSION}.log")
- - lcov --capture --directory build-${VERSION}
+ - lcov --capture --directory build
-q --output-file spm-${VERSION}-${RUN}.lcov
| tee -a spm-gcov-${VERSION}.log
--
GitLab