From 3be16e9ddfa824c6acea9944033174905f0038d3 Mon Sep 17 00:00:00 2001
From: Martin Beseda <martin.beseda@vsb.cz>
Date: Wed, 27 Mar 2019 02:22:30 +0100
Subject: [PATCH] [FIX] [ENH] Trying to fix and improve CI build stage.
---
.gitlab-ci.yml | 45 +++++++++++++++++++++++++++------------------
1 file changed, 27 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32b3eaa9..b803f291 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,6 @@
+stages:
+ - build
+
# Windows 10 with dependencies
# downloaded (and compiled) locally
win_visual_studio_static_local_deps:
@@ -6,17 +9,19 @@ win_visual_studio_static_local_deps:
image: windows:latest
+ stage: build
+
before_script:
- call VsDevCmd.bat
- set DEPENDENCIES_LINK_TYPE=static
- set clean_after=yes
+ - set BUILD_LIB=yes
+ - set BUILD_EXAMPLES=yes
+ - set BUILD_TESTS=yes
- call build_scripts\windows\win_VS_build_x64_release.bat
script:
-# - cd ..\..
- - cd build_scripts\windows
-# - call win_run_tests.bat
- - cd ..\..
+ - call build_scripts\windows\win_VS_build_x64_release.bat
# Latest Ubuntu with dependencies
# in system directories, Boost
@@ -24,47 +29,51 @@ win_visual_studio_static_local_deps:
ubuntu_boost_system:
image: martinbeseda/lib4neuro-ubuntu-system-deps:latest
+ stage: build
+
before_script:
- export TERM=xterm
- - cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=shared
- export CLEAN_AFTER=yes
- - ./linux_gcc_build_x64_debug_system.sh
+ - export BUILD_LIB=yes
+ - export BUILD_EXAMPLES=yes
+ - export BUILD_TESTS=yes
script:
- - cd ../..
- - cd build_scripts/linux
-# - './linux_run_tests.sh'
- - cd ../..
+ - build_scripts/linux/linux_gcc_build_x64_debug_system.sh
# Latest Ubuntu with dependencies
# downloaded (and compiled) locally
ubuntu_boost_local_static_deps:
image: martinbeseda/ubuntu-ci:latest
+ stage: build
+
before_script:
- export TERM=xterm
- - cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=static
- export CLEAN_AFTER=yes
- - ./linux_gcc_build_x64_debug_local.sh
+ - export BUILD_LIB=yes
+ - export BUILD_EXAMPLES=yes
+ - export BUILD_TESTS=yes
script:
- - cd ../..
- - cd build_scripts/linux
-# - './linux_run_tests.sh'
- - cd ../..
+ - build_scripts/linux/linux_gcc_build_x64_debug_local.sh
# Latest CentOS with dependencies
# downloaded (and compiled) locally
centos_local_deps:
image: martinbeseda/centos-ci:latest
+ stage: build
+
before_script:
- export TERM=xterm
- - cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=static
- export CLEAN_AFTER=yes
+ - export BUILD_LIB=yes
+ - export BUILD_EXAMPLES=yes
+ - export BUILD_TESTS=yes
script:
- - scl enable devtoolset-8 -- ./linux_gcc_build_x64_debug_local.sh
+ - scl enable devtoolset-8 -- build_scripts/linux/linux_gcc_build_x64_debug_local.sh
--
GitLab