From 1f44eec76aa3b1954da4539270057a8574ec069f Mon Sep 17 00:00:00 2001
From: Martin Beseda <martinbeseda@seznam.cz>
Date: Thu, 13 Sep 2018 18:52:44 +0200
Subject: [PATCH] Enabled Ubuntu tests in CI

---
 .gitlab-ci.yml | 118 ++++++++++++++++++++++++-------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9adf89fd..8ababa6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,69 +37,69 @@ win_visual_studio_static_deps:
 #
 #    script:
 #        - call win_run_tests.bat
-#
-#
+
+
 # Latest Ubuntu with Boost and Exprtk
 # in system directories, Boost
 # installed from the official repository
 # => only dynamical linking possible
-#ubuntu_boost_system:
-#    tags:
-#        - centos7
-#
-#    image: martinbeseda/dockertest:latest
-#
-#    before_script:
-#        - rm -rf external_dependencies
-#        - git clone https://github.com/ArashPartow/exprtk.git
-#        - cp exprtk/exprtk.hpp /usr/include
-#        - export TERM=xterm
-#        - cd build_scripts/linux
-#        - export DEPENDENCIES_LINK_TYPE=shared
-#        - ./linux_gcc_build_x64_debug_system.sh
-#
-#    script:
-#        - './linux_run_tests.sh'
-#
-## Latest Ubuntu with Boost and Exprtk
-## compiled locally as submodules and
-## linked statically
-#ubuntu_boost_local_static_deps:
-#    tags:
-#        - centos7
-#
-#    image: martinbeseda/ubuntu-ci:latest
-#
-#    before_script:
-#        - cd build_scripts/linux
-#        - ./download_dependencies.sh
-#        - cd ../..
-#        - cd build_scripts/linux
-#        - export DEPENDENCIES_LINK_TYPE=static
-#        - ./linux_gcc_build_x64_debug_local.sh
-#
-#    script:
-#        - './linux_run_tests.sh'
-#
-## Latest Ubuntu with Boost and Exprtk
-## compiled locally as submodules and
-## linked dynamically
-#ubuntu_boost_local_dynamic_deps:
-#    tags:
-#        - centos7
-#
-#    image: martinbeseda/ubuntu-ci:latest
-#
-#    before_script:
-#        - cd build_scripts/linux
-#        - ./download_dependencies.sh
-#        - cd ../..
-#        - cd build_scripts/linux
-#        - export DEPENDENCIES_LINK_TYPE=shared
-#        - ./linux_gcc_build_x64_debug_local.sh
-#
-#    script:
-#        - './linux_run_tests.sh'
+ubuntu_boost_system:
+    tags:
+        - centos7
+
+    image: martinbeseda/dockertest:latest
+
+    before_script:
+        - rm -rf external_dependencies
+        - git clone https://github.com/ArashPartow/exprtk.git
+        - cp exprtk/exprtk.hpp /usr/include
+        - export TERM=xterm
+        - cd build_scripts/linux
+        - export DEPENDENCIES_LINK_TYPE=shared
+        - ./linux_gcc_build_x64_debug_system.sh
+
+    script:
+        - './linux_run_tests.sh'
+
+# Latest Ubuntu with Boost and Exprtk
+# compiled locally as submodules and
+# linked statically
+ubuntu_boost_local_static_deps:
+    tags:
+        - centos7
+
+    image: martinbeseda/ubuntu-ci:latest
+
+    before_script:
+        - cd build_scripts/linux
+        - ./download_dependencies.sh
+        - cd ../..
+        - cd build_scripts/linux
+        - export DEPENDENCIES_LINK_TYPE=static
+        - ./linux_gcc_build_x64_debug_local.sh
+
+    script:
+        - './linux_run_tests.sh'
+
+# Latest Ubuntu with Boost and Exprtk
+# compiled locally as submodules and
+# linked dynamically
+ubuntu_boost_local_dynamic_deps:
+    tags:
+        - centos7
+
+    image: martinbeseda/ubuntu-ci:latest
+
+    before_script:
+        - cd build_scripts/linux
+        - ./download_dependencies.sh
+        - cd ../..
+        - cd build_scripts/linux
+        - export DEPENDENCIES_LINK_TYPE=shared
+        - ./linux_gcc_build_x64_debug_local.sh
+
+    script:
+        - './linux_run_tests.sh'
 
 
 #code_quality:
-- 
GitLab