From bd6bb8b59d5f9acdf37ee274ffa9dae8e243158a Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Thu, 2 Jul 2020 06:43:49 +0200
Subject: [PATCH] CI: test
---
.gitlab-ci.yml | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 865fbeb29..04f7a2490 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -87,7 +87,6 @@ variables:
script:
- echo "PWD; LS" # CI debug only
- pwd; ls # CI debug only
- - ls dependencies-install
- ls ../ # CI debug only
- ls ../../ # CI debug only
- cmake --version # CI debug only
@@ -102,7 +101,30 @@ variables:
- pwd; ls # CI debug only
- ls ../ # CI debug only
- ls ../../ # CI debug only
+ artifacts:
+ paths:
+ - install
+# temp template
+.geomodel-build-template-viz: &geomodel-viz-job
+ script:
+ - echo "PWD; LS" # CI debug only
+ - pwd; ls # CI debug only
+ - ls dependencies-install
+ - ls ../ # CI debug only
+ - ls ../../ # CI debug only
+ - cmake --version # CI debug only
+ - mkdir build
+ - cd build
+ - echo "CMAKE_ARGS - ${CMAKE_ARGS}"
+ - echo "CMAKE_EXTRA_FLAGS - ${CMAKE_EXTRA_FLAGS}"
+ - cmake ${CMAKE_ARGS} ${CMAKE_EXTRA_FLAGS} ..
+ # - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_PREFIX_PATH=../dependencies-install -DGEOMODEL_BUILD_VISUALIZATION=TRUE -DGEOMODEL_USE_BUILTIN_JSON=TRUE -DGEOMODEL_USE_BUILTIN_XERCESC=TRUE ..
+ - cmake --build . -- -j2 # using too many threads will cause weird compilation errors on the Ubuntu docker images...
+ - cmake --build . -- install
+ - pwd; ls # CI debug only
+ - ls ../ # CI debug only
+ - ls ../../ # CI debug only
artifacts:
paths:
- install
@@ -158,7 +180,7 @@ ubuntu-geomodel-base-builtinNlohmannXercesC:
ubuntu-geomodeL-visualization-builtinNlohmannXercesC:
<<: *ubuntu-job
- <<: *geomodel-job
+ <<: *geomodel-viz-job
needs: ["ubuntu-coin", "ubuntu-soqt"]
stage: step-C
variables:
--
GitLab