From 6097d4fa0c63720b03513887036d3039ac3510e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz> Date: Mon, 17 Sep 2018 09:52:55 +0200 Subject: [PATCH] Disabled building Benchmarks, Examples, Tools and Python in one half of the CI jobs The benchmarks, examples, tools or Python bindings are not run by the CI, so we just check that they can be compiled. But we don't have to do it twice... --- .gitlab-ci.yml | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4a98a9e12..9984e4843a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,11 @@ stages: WITH_MIC: "no" WITH_TESTS: "yes" WITH_COVERAGE: "no" - WITH_EXAMPLES: "yes" + # these are built only in the "full" config + WITH_BENCHMARKS: "no" + WITH_EXAMPLES: "no" + WITH_TOOLS: "no" + WITH_PYTHON: "no" # template for build jobs .build_template_def: &build_template @@ -46,7 +50,10 @@ stages: -DWITH_MIC=${WITH_MIC} -DWITH_TESTS=${WITH_TESTS} -DWITH_COVERAGE=${WITH_COVERAGE} + -DWITH_BENCHMARKS=${WITH_BENCHMARKS} -DWITH_EXAMPLES=${WITH_EXAMPLES} + -DWITH_TOOLS=${WITH_TOOLS} + -DWITH_PYTHON=${WITH_PYTHON} # - make # - make test # - make install @@ -61,7 +68,7 @@ stages: # Cuda builds are specified first because they take more time than host-only builds, # which can be allocated on hosts whitout GPUs. -cuda_Debug: +cuda_base_Debug: <<: *build_template tags: - gpu @@ -70,7 +77,7 @@ cuda_Debug: WITH_CUDA: "yes" BUILD_TYPE: Debug -cuda_Release: +cuda_base_Release: <<: *build_template tags: - gpu @@ -79,7 +86,7 @@ cuda_Release: WITH_CUDA: "yes" BUILD_TYPE: Release -cuda+openmp_Debug: +cuda_full_Debug: <<: *build_template tags: - openmp @@ -89,8 +96,12 @@ cuda+openmp_Debug: WITH_OPENMP: "yes" WITH_CUDA: "yes" BUILD_TYPE: Debug + WITH_BENCHMARKS: "yes" + WITH_EXAMPLES: "yes" + WITH_TOOLS: "yes" + WITH_PYTHON: "yes" -cuda+openmp_Release: +cuda_full_Release: <<: *build_template tags: - openmp @@ -100,17 +111,21 @@ cuda+openmp_Release: WITH_OPENMP: "yes" WITH_CUDA: "yes" BUILD_TYPE: Release + WITH_BENCHMARKS: "yes" + WITH_EXAMPLES: "yes" + WITH_TOOLS: "yes" + WITH_PYTHON: "yes" -default_Debug: +default_base_Debug: <<: *build_template -default_Release: +default_base_Release: <<: *build_template variables: <<: *default_cmake_flags BUILD_TYPE: Release -openmp_Debug: +default_full_Debug: <<: *build_template tags: - openmp @@ -118,8 +133,12 @@ openmp_Debug: <<: *default_cmake_flags WITH_OPENMP: "yes" BUILD_TYPE: Debug + WITH_BENCHMARKS: "yes" + WITH_EXAMPLES: "yes" + WITH_TOOLS: "yes" + WITH_PYTHON: "yes" -openmp_Release: +default_full_Release: <<: *build_template tags: - openmp @@ -127,3 +146,7 @@ openmp_Release: <<: *default_cmake_flags WITH_OPENMP: "yes" BUILD_TYPE: Release + WITH_BENCHMARKS: "yes" + WITH_EXAMPLES: "yes" + WITH_TOOLS: "yes" + WITH_PYTHON: "yes" -- GitLab