fix conflic in CI build file, cherry picked from 0.1.8 branch

.gitlab-ci.yml

@@ -1,3 +1,62 @@
-hello:
+stages:
+ - build
+ - test
+ - deploy
+
+before_script:
+  - ./bootstrap
+  - ./configure --enable-gcov
+
+build:
+ stage: build
  script:
-  - echo "Hello World"
+  - make
+
+coverage:dev:
+ stage: test
+ except:
+  - tags
+ script:
+  - make coverage-html
+  - ssh ci_upload@192.168.20.60 install -d taskrambler
+  - >
+    rsync -vaurl --delete tests/coverage/*/
+    ci_upload@192.168.20.60:~/taskrambler/coverage_${CI_BUILD_ID}
+  - ssh ci_upload@192.168.20.60 rm -f taskrambler/coverage_latest
+  - >
+    ssh ci_upload@192.168.20.60
+    ln -s coverage_${CI_BUILD_ID} taskrambler/coverage_latest
+
+coverage:tag:
+ stage: test
+ only:
+  - tags
+ script:
+  - make coverage-html
+  - ssh ci_upload@192.168.20.60 install -d taskrambler
+  - >
+    rsync -vaurl --delete tests/coverage
+    ci_upload@192.168.20.60:~/taskrambler/
+
+docs:
+ stage: deploy
+ only:
+  - tags
+ script:
+  - make docs
+  - >
+    rsync -vaurl --delete docs/api/*/html/
+    ci_upload@192.168.20.60:~/taskrambler/api_${CI_BUILD_ID}
+  - ssh ci_upload@192.168.20.60 rm -f taskrambler/api_latest
+  - >
+    ssh ci_upload@192.168.20.60
+    ln -s api_${CI_BUILD_ID} taskrambler/api_latest
+
+dist:
+ stage: deploy
+ only:
+  - tags
+ script:
+  - make dist
+  - ssh ci_upload@192.168.20.60 install -d taskrambler/artifacts
+  - scp taskrambler-*.tar.gz ci_upload@192.168.20.60:~/taskrambler/artifacts