From f2b36b9fb72f1e651cde630228aa3b760aef1289 Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Mon, 6 May 2019 09:31:53 +0300
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c3bf601a..45324b901 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,22 @@
-image: ubuntu:18.04
-
-before_script:
- - export DEBIAN_FRONTEND=noninteractive
- - apt-get update -qq && apt-get install -y -qq g++ cmake git
- - apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libreadline-dev libmsgpack-dev uuid-dev
+windows job:
+ tags:
+ - win
+ script:
+ - echo "OK"
+
+linux job:
+ tags:
+ - docker
-ftl:
+ image: ubuntu:18.04
+
+ before_script:
+ - export DEBIAN_FRONTEND=noninteractive
+ - apt-get update -qq && apt-get install -y -qq g++ cmake git
+ - apt-get install -y -qq libopencv-dev libgoogle-glog-dev liburiparser-dev libreadline-dev libmsgpack-dev uuid-dev
script:
- mkdir build
- cd build
- cmake ..
- make
- make test
-
--
GitLab