From 7f903b601b4310753f220e0344be79b9dd93afd0 Mon Sep 17 00:00:00 2001
From: Filip Bucek <filip.bucek@spaceti.com>
Date: Fri, 8 Nov 2019 18:21:59 +0100
Subject: [PATCH] updating ci

---
 .gitlab-ci.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99da401..bb1e0c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,23 +6,29 @@ stages:
 # To clone also submodules
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
+  PRO_FILE: ../colnod-connector.pro
+  SCRIPT_PATH: server-sdk/scripts
 
+cache:
+  paths:
+  - build/
 
-##########
+###########
 # Build
 ##########
 build:
   stage: build
   tags:
-    - shell
+  - shell
+  before_script:
+  - git submodule sync --recursive
+  - git submodule update --init --recursive
   script:
+  - ls server-sdk
   - mkdir -p build
   - cd build
-  - qmake ../colnod-connector.pro
+  - qmake $PRO_FILE
   - make -j4
-  artifacts:
-    paths:
-    - build/
 
 ##########
 # Test
@@ -32,7 +38,9 @@ test:
   tags:
     - shell
   script:
+  - mkdir -p build
   - cd build
+  - qmake $PRO_FILE
   - make check
 
 # memory leak check for unittest
@@ -41,7 +49,9 @@ valgrind:
   tags:
     - shell
   script:
+  - mkdir -p build
   - cd build
+  - qmake $PRO_FILE
   - valgrind make check
 
 # Quality of code
@@ -51,7 +61,7 @@ cppcheck:
     - shell
   #allow_failure: true # Probably needed to allow failure
   script:
-  - server-sdk/scripts/cppcheck.sh
+  - $SCRIPT_PATH/cppcheck.sh
   dependencies: []
 
 # Common checks ( Line endings )