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