diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
| commit | 7f22d3c20cc24debfe123425efa63ec5293e4b4c (patch) | |
| tree | f773b80964981c231c892ee5255b94285bc5620a /.gitlab-ci.yml | |
| parent | 9127307734c85b816ac7dbb539b565ffb106d60f (diff) | |
| parent | da4af2ab5d105f6d2ce442b517e532b7570616e3 (diff) | |
| download | Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.tar.bz2 Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a5476081..1510bd619 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,19 +13,25 @@ variables: services: - iggdrasil/postgis-1.5 -master: - script: "make test_gitlab" +build: + stage: "build" + script: "make build_gitlab" only: - master + - v0.9 + - wheezy -stable: +test: + stage: "test" script: "make test_gitlab" only: + - master - v0.9 + - wheezy debian: + stage: "test" script: - - make test_gitlab - 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 |