Skip to content
Snippets Groups Projects
Commit f1586112 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Revert "ldconfig & tests and demos not built for deps" 

This reverts commit e970bcdb
parent e970bcdb
No related branches found
No related tags found
1 merge request!23Falko implementation
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 6 deletions
.gitlab-ci.yml
+ 18
− 6
View file @ f1586112
...@@ -26,6 +26,7 @@ stages: ...@@ -26,6 +26,7 @@ stages:
# update apt # update apt
- apt-get update - apt-get update
- ldconfig
# create 'ci_deps' folder (if not exists) # create 'ci_deps' folder (if not exists)
- mkdir -pv ci_deps - mkdir -pv ci_deps
...@@ -44,10 +45,10 @@ stages: ...@@ -44,10 +45,10 @@ stages:
- fi - fi
- mkdir -pv build - mkdir -pv build
- cd 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) - make -j$(nproc)
- ctest -j$(nproc)
- make install - make install
- ldconfig
.license_header_template: &license_header_definition .license_header_template: &license_header_definition
- cd $CI_PROJECT_DIR - cd $CI_PROJECT_DIR
...@@ -99,7 +100,6 @@ stages: ...@@ -99,7 +100,6 @@ stages:
- cmake -DCMAKE_BUILD_TYPE=release .. - cmake -DCMAKE_BUILD_TYPE=release ..
- make -j$(nproc) - make -j$(nproc)
- make install - make install
- ldconfig
.install_csm_template: &install_csm_definition .install_csm_template: &install_csm_definition
- cd ${CI_PROJECT_DIR}/ci_deps - cd ${CI_PROJECT_DIR}/ci_deps
...@@ -115,7 +115,6 @@ stages: ...@@ -115,7 +115,6 @@ stages:
- cmake . - cmake .
- make -j$(nproc) - make -j$(nproc)
- make install - make install
- ldconfig
.install_falko_template: &install_falko_definition .install_falko_template: &install_falko_definition
- cd ${CI_PROJECT_DIR}/ci_deps - cd ${CI_PROJECT_DIR}/ci_deps
...@@ -132,13 +131,12 @@ stages: ...@@ -132,13 +131,12 @@ stages:
- cmake .. - cmake ..
- make -j$(nproc) - make -j$(nproc)
- make install - make install
- ldconfig
.build_and_test_template: &build_and_test_definition .build_and_test_template: &build_and_test_definition
- cd ${CI_PROJECT_DIR} - cd ${CI_PROJECT_DIR}
- mkdir -pv build - mkdir -pv build
- cd 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) - make -j$(nproc)
- ctest - ctest
- make install - make install
...@@ -176,6 +174,7 @@ build_and_test_none:xenial: ...@@ -176,6 +174,7 @@ build_and_test_none:xenial:
- *preliminaries_definition - *preliminaries_definition
- *install_wolf_definition - *install_wolf_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -199,6 +198,8 @@ build_and_test_csm:xenial: ...@@ -199,6 +198,8 @@ build_and_test_csm:xenial:
- *install_wolf_definition - *install_wolf_definition
- *install_csm_definition - *install_csm_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -222,6 +223,8 @@ build_and_test_falko:xenial: ...@@ -222,6 +223,8 @@ build_and_test_falko:xenial:
- *install_wolf_definition - *install_wolf_definition
- *install_falko_definition - *install_falko_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -249,6 +252,8 @@ build_and_test_csm_falko:xenial: ...@@ -249,6 +252,8 @@ build_and_test_csm_falko:xenial:
- *install_falko_definition - *install_falko_definition
- *install_csm_definition - *install_csm_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -269,6 +274,7 @@ build_and_test_none:bionic: ...@@ -269,6 +274,7 @@ build_and_test_none:bionic:
- *preliminaries_definition - *preliminaries_definition
- *install_wolf_definition - *install_wolf_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -292,6 +298,8 @@ build_and_test_csm:bionic: ...@@ -292,6 +298,8 @@ build_and_test_csm:bionic:
- *install_wolf_definition - *install_wolf_definition
- *install_csm_definition - *install_csm_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -315,6 +323,8 @@ build_and_test_falko:bionic: ...@@ -315,6 +323,8 @@ build_and_test_falko:bionic:
- *install_wolf_definition - *install_wolf_definition
- *install_falko_definition - *install_falko_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
...@@ -342,5 +352,7 @@ build_and_test_csm_falko:bionic: ...@@ -342,5 +352,7 @@ build_and_test_csm_falko:bionic:
- *install_falko_definition - *install_falko_definition
- *install_csm_definition - *install_csm_definition
- *install_laserscanutils_definition - *install_laserscanutils_definition
- ldconfig # update links (shared libraries)
script: script:
- *build_and_test_definition - *build_and_test_definition
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment