diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:59:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-21 23:59:27 +0100 |
| commit | b8cf790377a2ece768ea19bd1d216fdf0ee78cda (patch) | |
| tree | b72020ae9a2cee74a3060fc17495f445aa414e0e /Makefile.example | |
| parent | 456b74ac295815970483871cf2575863bc97dd6f (diff) | |
| parent | 88fde9b54bd94e582fa4f8886463eda2e39ceb46 (diff) | |
| download | Ishtar-b8cf790377a2ece768ea19bd1d216fdf0ee78cda.tar.bz2 Ishtar-b8cf790377a2ece768ea19bd1d216fdf0ee78cda.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.example b/Makefile.example index e7e604706..ac8e54cc5 100644 --- a/Makefile.example +++ b/Makefile.example @@ -52,10 +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 +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: @@ -243,7 +244,7 @@ fixtures_files: archaeological_files.permittype \ > '../archaeological_files/fixtures/initial_data-'$(default_data)'.json' -translations_push: makemessages +translations_push: translations_pull makemessages zanata-cli push translations_pull: |