diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 11:42:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-01 11:42:01 +0200 |
| commit | 28ffda41e1400524747b3cb6c505fd172611aed8 (patch) | |
| tree | ef35cab2be410cfa1c9d308ac68d12fc76a5bc67 /.gitlab-ci.yml | |
| parent | 55bb5ec780fd03f671f6df6272e08227fc498f84 (diff) | |
| parent | 46c97a2e19d5048c370342dc388bd457a861406a (diff) | |
| download | Ishtar-28ffda41e1400524747b3cb6c505fd172611aed8.tar.bz2 Ishtar-28ffda41e1400524747b3cb6c505fd172611aed8.zip | |
Merge branch 'master' into develop
Conflicts:
.gitlab-ci.yml
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 62 |
1 files changed, 54 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 813f7dd85..6de24cc8c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,30 +10,73 @@ variables: POSTGRES_USER: gis POSTGRES_PASSWORD: "gis" -services: - - iggdrasil/postgis-1.5 - build: + stage: "build" + script: "make build_gitlab" + services: + - iggdrasil/postgis-1.5 tags: - - jessie + - wheezy + only: + - master + - v0.9 + - wheezy + +build-v2: stage: "build" script: "make build_gitlab" + services: + - mdillon/postgis + tags: + - jessie only: - develop - v2.0 + - jessie test: + stage: "test" + script: "make test_gitlab" + services: + - iggdrasil/postgis-1.5 tags: - - jessie + - wheezy + only: + - master + - v0.9 + - wheezy + +test-v2: stage: "test" script: "make test_gitlab" + services: + - mdillon/postgis + tags: + - jessie only: - develop - v2.0 + - jessie debian: + stage: "test" + script: + - apt-get install -q -y devscripts build-essential lintian wget + - make deb + - wget -O /etc/apt/sources.list.d/iggdrasil.list http://deb.iggdrasil.net/dists/wheezy/iggdrasil.list + - wget -O - http://deb.iggdrasil.net/contact@iggdrasil.net.gpg.key | apt-key add - + - apt-get update + - apt-get install -q -y --force-yes python-django-ishtar locales-all + - INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance + - dpkg -i python-django-ishtar_*.deb + services: + - iggdrasil/postgis-1.5 tags: - - jessie + - wheezy + only: + - wheezy + +debian-v2: stage: "test" script: - apt-get install -q -y devscripts build-essential lintian wget @@ -44,6 +87,9 @@ debian: - apt-get install -q -y --force-yes python-django-ishtar locales-all - INSTANCE=my_ishtar URL=localhost ishtar-prepare-instance - dpkg -i python-django-ishtar_*.deb + services: + - mdillon/postgis + tags: + - jessie only: - - develop - - v2.0 + - jessie |