diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 063e61049e503cd464c2338c6ebae26d151386b2..58996a69eb24a37fb2052ae7c02bc1dde59b5965 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,41 +1,41 @@ # Windows 10 with Boost and Exprtk # downloaded and compiled locally as # submodules and linked statically -#win_visual_studio_static_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=static -# - call win_VS_build_x64_debug.bat -# -# script: -# - call win_run_tests.bat -# -## Windows 10 with Boost and Exprtk -## 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 +win_visual_studio_static_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=static + - call win_VS_build_x64_debug.bat + + script: + - call win_run_tests.bat + +# Windows 10 with Boost and Exprtk +# downloaded and compiled locally as +# submodules and link dynamically # -# 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 + - cd ..\.. + - cd build_scripts\windows + - set DEPENDENCIES_LINK_TYPE=shared + - call win_VS_build_x64_debug.bat + + script: + - call win_run_tests.bat # Latest Ubuntu with Boost and Exprtk @@ -62,42 +62,42 @@ ubuntu_boost_system: # 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_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: