summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml19
1 files changed, 12 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1510bd619..813f7dd85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,22 +14,26 @@ services:
- iggdrasil/postgis-1.5
build:
+ tags:
+ - jessie
stage: "build"
script: "make build_gitlab"
only:
- - master
- - v0.9
- - wheezy
+ - develop
+ - v2.0
test:
+ tags:
+ - jessie
stage: "test"
script: "make test_gitlab"
only:
- - master
- - v0.9
- - wheezy
+ - develop
+ - v2.0
debian:
+ tags:
+ - jessie
stage: "test"
script:
- apt-get install -q -y devscripts build-essential lintian wget
@@ -41,4 +45,5 @@ debian:
- INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance
- dpkg -i python-django-ishtar_*.deb
only:
- - wheezy
+ - develop
+ - v2.0