From be0e0d4d37070deb15c21543e016564e75499106 Mon Sep 17 00:00:00 2001
From: Filip Bucek <filip.bucek@spaceti.com>
Date: Fri, 8 Nov 2019 17:43:44 +0100
Subject: [PATCH 1/3] returning back to using 'cache'

---
 .gitlab-ci.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bcef21..28ae0d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,15 +14,16 @@ variables:
 build:
   stage: build
   tags:
-    - vm
+    - shell
   script:
   - mkdir -p build
   - cd build
   - qmake ../colnod-connector.pro
   - make -j4
-  artifacts:
+  cache:
+    key: ${CI_BUILD_REF_NAME}
     paths:
-    - build/
+        - build/
 
 # ########
 # Test
@@ -30,7 +31,7 @@ build:
 test:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - cd build
   - make check
@@ -40,7 +41,7 @@ test:
 valgrind:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - cd build
   - valgrind make check
@@ -49,7 +50,7 @@ valgrind:
 cppcheck:
   stage: test
   tags:
-    - vm
+    - shell
   #allow_failure: true # Probably needed to allow failure
   script:
   - server-sdk/scripts/cppcheck.sh
@@ -58,14 +59,14 @@ cppcheck:
 lineendings:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/check.sh
 
 codecoverage:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/codecoverage.sh
   coverage: '/^\s+functions..:\s+(\d+\.\d+%).+$/'
@@ -73,6 +74,6 @@ codecoverage:
 doc:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/doc.sh clean # 'clean' better clean before generating documentation

From 71d66a74fd5f344eb37e0d19984b20affd353a6e Mon Sep 17 00:00:00 2001
From: Filip Bucek <filip.bucek@spaceti.com>
Date: Fri, 8 Nov 2019 17:58:01 +0100
Subject: [PATCH 2/3] updating ci

---
 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28ae0d2..99da401 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 
-# ########
+##########
 # Build
 ##########
 build:
@@ -20,12 +20,11 @@ build:
   - cd build
   - qmake ../colnod-connector.pro
   - make -j4
-  cache:
-    key: ${CI_BUILD_REF_NAME}
+  artifacts:
     paths:
-        - build/
+    - build/
 
-# ########
+##########
 # Test
 ##########
 test:
@@ -36,7 +35,6 @@ test:
   - cd build
   - make check
 
-
 # memory leak check for unittest
 valgrind:
   stage: test
@@ -54,6 +52,7 @@ cppcheck:
   #allow_failure: true # Probably needed to allow failure
   script:
   - server-sdk/scripts/cppcheck.sh
+  dependencies: []
 
 # Common checks ( Line endings )
 lineendings:
@@ -62,6 +61,7 @@ lineendings:
     - shell
   script:
   - server-sdk/scripts/check.sh
+  dependencies: []
 
 codecoverage:
   stage: test
@@ -70,6 +70,7 @@ codecoverage:
   script:
   - server-sdk/scripts/codecoverage.sh
   coverage: '/^\s+functions..:\s+(\d+\.\d+%).+$/'
+  dependencies: []
 
 doc:
   stage: test
@@ -77,3 +78,4 @@ doc:
     - shell
   script:
   - server-sdk/scripts/doc.sh clean # 'clean' better clean before generating documentation
+  dependencies: []

From 22080cb83ba33a24c1194cb61858182b6afc2a0c Mon Sep 17 00:00:00 2001
From: Filip Bucek <filip.bucek@spaceti.com>
Date: Fri, 8 Nov 2019 17:59:11 +0100
Subject: [PATCH 3/3] updating ci

---
 server-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-sdk b/server-sdk
index 00596d5..ee50768 160000
--- a/server-sdk
+++ b/server-sdk
@@ -1 +1 @@
-Subproject commit 00596d53db90dcd2325e9c31b019a570b34d750c
+Subproject commit ee507683c6faf69730451b16fbe3ef2b508a15fa