diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 15:08:55 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 15:08:55 +0100 |
| commit | a6aa4a51de80cd60610c3f19460f64cd4e820e75 (patch) | |
| tree | f21af06ea04c7ee91fd22a57c3bdf53e5a76ad55 | |
| parent | b37fea20fd79ecc0f7174dda57720f61efb4989b (diff) | |
| download | Ishtar-a6aa4a51de80cd60610c3f19460f64cd4e820e75.tar.bz2 Ishtar-a6aa4a51de80cd60610c3f19460f64cd4e820e75.zip | |
CI: split in differents stages
| -rw-r--r-- | .gitlab-ci.yml | 14 | ||||
| -rw-r--r-- | Makefile.example | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a5476081..69d443a1c 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: "debian-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 diff --git a/Makefile.example b/Makefile.example index f3ec3f7fd..ac8e54cc5 100644 --- a/Makefile.example +++ b/Makefile.example @@ -52,15 +52,11 @@ coverage: clean archaeological_context_records,archaeological_files,archaeological_finds,archaeological_warehouse,\ archaeological_files_pdl" ./manage.py test $(apps) && coverage report -test_gitlab: clean - # test migrations - cd $(project); $(PYTHON) ./manage.py syncdb --noinput - # only necessary on master - cd $(project); $(PYTHON) ./manage.py migrate ishtar_common - cd $(project); $(PYTHON) ./manage.py migrate archaeological_files 0013 - cd $(project); $(PYTHON) ./manage.py migrate archaeological_operations 0040 - cd $(project); $(PYTHON) ./manage.py migrate archaeological_files +build_gitlab: + cd $(project); $(PYTHON) ./manage.py syncdb --noinput 2> /dev/null > /dev/null cd $(project); $(PYTHON) ./manage.py migrate + +test_gitlab: clean cd $(project); $(PYTHON) manage.py test $(apps) pep8: |