From 1de267e18f6d0d212c0238b937f446d3cfc4bf39 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 2 Nov 2018 16:26:57 +0100
Subject: [PATCH] complete cmake use in gitlab-ci
---
.gitlab-ci.yml | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0f4175a51..875c1609fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ build-gcc:
build-clang:
<<: *build
-build-cmake-clang:
+.build-cmake: &build-cmake
variables:
EXTRA_PKGS: cmake python3 py3-click
script:
@@ -73,6 +73,12 @@ build-cmake-clang:
expire_in: 1 day
stage: build
+build-cmake-clang:
+ <<: *build-cmake
+
+build-cmake-gcc:
+ <<: *build-cmake
+
build-doc:
variables:
EXTRA_PKGS: doxygen graphviz
@@ -114,12 +120,20 @@ test-clang:
dependencies:
- build-clang
-test-cmake-clang:
+.test-cmake: &test-cmake
variables:
# coreutils are needed because of timeout command used in tests.
EXTRA_PKGS: bc coreutils python3
script:
- for test in $(ls tests.*.sh); do ./${test} release/bin ${JOBS}; touch release/bin/log_tests.txt; cat release/bin/log_tests.txt; done
stage: test
+
+test-cmake-gcc:
+ <<: *test-cmake
+ dependencies:
+ - build-cmake-gcc
+
+test-cmake-clang:
+ <<: *test-cmake
dependencies:
- build-cmake-clang
--
GitLab