diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 11:20:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 11:20:56 +0200 |
| commit | 55bb5ec780fd03f671f6df6272e08227fc498f84 (patch) | |
| tree | c92409da68a3b91e4c4768352b52b8a8c8ee0a95 | |
| parent | 39316f9c71948af2b0f6334a5f843feacadc8360 (diff) | |
| download | Ishtar-55bb5ec780fd03f671f6df6272e08227fc498f84.tar.bz2 Ishtar-55bb5ec780fd03f671f6df6272e08227fc498f84.zip | |
Update gitlab-ci
| -rw-r--r-- | .gitlab-ci.yml | 19 |
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 |