From f158611271160ef83bcdf99c87bd9774e9014094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Fri, 3 Dec 2021 09:40:59 +0100
Subject: [PATCH] Revert "ldconfig & tests and demos not built for deps"
This reverts commit e970bcdb36455c1401f076e43a9e42276f0340bc
---
.gitlab-ci.yml | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11a7b5c3d..a1be383d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ stages:
# update apt
- apt-get update
+ - ldconfig
# create 'ci_deps' folder (if not exists)
- mkdir -pv ci_deps
@@ -44,10 +45,10 @@ stages:
- fi
- mkdir -pv build
- cd build
- - cmake -DCMAKE_BUILD_TYPE=release -DBUILD_DEMOS=OFF -DBUILD_TESTS=OFF ..
+ - cmake -DCMAKE_BUILD_TYPE=release -DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON ..
- make -j$(nproc)
+ - ctest -j$(nproc)
- make install
- - ldconfig
.license_header_template: &license_header_definition
- cd $CI_PROJECT_DIR
@@ -99,7 +100,6 @@ stages:
- cmake -DCMAKE_BUILD_TYPE=release ..
- make -j$(nproc)
- make install
- - ldconfig
.install_csm_template: &install_csm_definition
- cd ${CI_PROJECT_DIR}/ci_deps
@@ -115,7 +115,6 @@ stages:
- cmake .
- make -j$(nproc)
- make install
- - ldconfig
.install_falko_template: &install_falko_definition
- cd ${CI_PROJECT_DIR}/ci_deps
@@ -132,13 +131,12 @@ stages:
- cmake ..
- make -j$(nproc)
- make install
- - ldconfig
.build_and_test_template: &build_and_test_definition
- cd ${CI_PROJECT_DIR}
- mkdir -pv build
- cd build
- - cmake -DCMAKE_BUILD_TYPE=release -DBUILD_TESTS=ON ..
+ - cmake -DCMAKE_BUILD_TYPE=release -DBUILD_EXAMPLES=ON -DBUILD_TESTS=ON ..
- make -j$(nproc)
- ctest
- make install
@@ -176,6 +174,7 @@ build_and_test_none:xenial:
- *preliminaries_definition
- *install_wolf_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
script:
- *build_and_test_definition
@@ -199,6 +198,8 @@ build_and_test_csm:xenial:
- *install_wolf_definition
- *install_csm_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
+
script:
- *build_and_test_definition
@@ -222,6 +223,8 @@ build_and_test_falko:xenial:
- *install_wolf_definition
- *install_falko_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
+
script:
- *build_and_test_definition
@@ -249,6 +252,8 @@ build_and_test_csm_falko:xenial:
- *install_falko_definition
- *install_csm_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
+
script:
- *build_and_test_definition
@@ -269,6 +274,7 @@ build_and_test_none:bionic:
- *preliminaries_definition
- *install_wolf_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
script:
- *build_and_test_definition
@@ -292,6 +298,8 @@ build_and_test_csm:bionic:
- *install_wolf_definition
- *install_csm_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
+
script:
- *build_and_test_definition
@@ -315,6 +323,8 @@ build_and_test_falko:bionic:
- *install_wolf_definition
- *install_falko_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
+
script:
- *build_and_test_definition
@@ -342,5 +352,7 @@ build_and_test_csm_falko:bionic:
- *install_falko_definition
- *install_csm_definition
- *install_laserscanutils_definition
+ - ldconfig # update links (shared libraries)
+
script:
- *build_and_test_definition
--
GitLab