From f68b93aef4fecf065e7aac7d10e10fc8a6c2b5d0 Mon Sep 17 00:00:00 2001
From: David Vojtek <david.vojtek1@vsb.cz>
Date: Fri, 19 Oct 2018 12:11:24 +0200
Subject: [PATCH] FIX: Trying to fix CI
---
.gitlab-ci.yml | 85 ++++++++++++++++++++++++++++++++++++--------------
1 file changed, 61 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff058110..86ae5546 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
-# Windows 10 with Boost and Exprtk
+# Windows 10 with Boost, Exprtk and Turtle
# downloaded and compiled locally as
# submodules and linked statically
-win_visual_studio_static_deps:
+win_visual_studio_static_local_deps:
tags:
- Win
@@ -12,33 +12,56 @@ win_visual_studio_static_deps:
- cd ..\..
- cd build_scripts\windows
- set DEPENDENCIES_LINK_TYPE=static
+ - set clean_after=yes
- call win_VS_build_x64_debug.bat
+ - cd ..\..
script:
+ - cd build_scripts\windows
- call win_run_tests.bat
+ - cd ..\..
-# Windows 10 with Boost and Exprtk
+# Windows 10 with Boost, Exprtk and Turtle
# downloaded and compiled locally as
# submodules and link dynamically
#
-win_visual_studio_shared_deps:
- tags:
- - Win
-
- before_script:
- - call VsDevCmd.bat
- - cd build_scripts\windows
- - call win_download_dependencies.bat
- - cd ..\..
- - cd build_scripts\windows
- - set DEPENDENCIES_LINK_TYPE=shared
- - call win_VS_build_x64_debug.bat
-
- script:
- - call win_run_tests.bat
+#win_visual_studio_shared_deps:
+# tags:
+# - Win
+#
+# before_script:
+# - call VsDevCmd.bat
+# - cd build_scripts\windows
+# - call win_download_dependencies.bat
+# - set DEPENDENCIES_LINK_TYPE=shared
+# - call win_VS_build_x64_debug.bat
+# - cd ..\..
+#
+# script:
+# - cd build_scripts\windows
+# - call win_run_tests.bat
+# - cd ..\..
+#
+#
+#win_visual_studio_shared_local_deps:
+# tags:
+# - Win
+#
+# before_script:
+# - call VsDevCmd.bat
+# - cd build_scripts\windows
+# - call win_download_dependencies.bat
+# - set DEPENDENCIES_LINK_TYPE=shared
+# - call win_VS_build_x64_debug.bat
+# - cd ..\..
+#
+# script:
+# - cd build_scripts\windows
+# - call win_run_tests.bat
+# - cd ..\..
-# Latest Ubuntu with Boost and Exprtk
+# Latest Ubuntu with Boost, Exprtk and Turtle
# in system directories, Boost
# installed from the official repository
# => only dynamical linking possible
@@ -49,18 +72,22 @@ ubuntu_boost_system:
image: martinbeseda/dockertest:latest
before_script:
- - rm -rf external_dependencies
- - git clone https://github.com/ArashPartow/exprtk.git
- - cp exprtk/exprtk.hpp /usr/include
+ - rm -rf external_dependencies/boost/*
+ - rm -rf external_dependencies/exprtk/*
+ - rm -rf exprtk
- export TERM=xterm
- cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=shared
+ - export CLEAN_AFTER=yes
- ./linux_gcc_build_x64_debug_system.sh
+ - cd ../..
script:
+ - cd build_scripts/linux
- './linux_run_tests.sh'
+ - cd ../..
-# Latest Ubuntu with Boost and Exprtk
+# Latest Ubuntu with Boost, Exprtk and Turtle
# compiled locally as submodules and
# linked statically
ubuntu_boost_local_static_deps:
@@ -70,17 +97,22 @@ ubuntu_boost_local_static_deps:
image: martinbeseda/ubuntu-ci:latest
before_script:
+ - export TERM=xterm
- cd build_scripts/linux
- ./download_dependencies.sh
- cd ../..
- cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=static
+ - export CLEAN_AFTER=yes
- ./linux_gcc_build_x64_debug_local.sh
+ - cd ../..
script:
+ - cd build_scripts/linux
- './linux_run_tests.sh'
+ - cd ../..
-# Latest Ubuntu with Boost and Exprtk
+# Latest Ubuntu with Boost, Exprtk and Turtle
# compiled locally as submodules and
# linked dynamically
ubuntu_boost_local_dynamic_deps:
@@ -90,15 +122,20 @@ ubuntu_boost_local_dynamic_deps:
image: martinbeseda/ubuntu-ci:latest
before_script:
+ - export TERM=xterm
- cd build_scripts/linux
- ./download_dependencies.sh
- cd ../..
- cd build_scripts/linux
- export DEPENDENCIES_LINK_TYPE=shared
+ - export CLEAN_AFTER=yes
- ./linux_gcc_build_x64_debug_local.sh
+ - cd ../..
script:
+ - cd build_scripts/linux
- './linux_run_tests.sh'
+ - cd ../..
#code_quality:
--
GitLab