diff options
| author | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
| commit | 655236dd5d04d6527184a58ef8622e75c73f8a65 (patch) | |
| tree | f773b80964981c231c892ee5255b94285bc5620a /Makefile.example | |
| parent | dc08e5f643562a6ecf3b208c1e2cd44e5350af3c (diff) | |
| parent | a4f1766d2217b1a3bc4d1d17625d9d808eed7416 (diff) | |
| download | Ishtar-655236dd5d04d6527184a58ef8622e75c73f8a65.tar.bz2 Ishtar-655236dd5d04d6527184a58ef8622e75c73f8a65.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'Makefile.example')
| -rw-r--r-- | Makefile.example | 12 |
1 files changed, 4 insertions, 8 deletions
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: |