diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-25 18:47:43 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-25 18:47:43 +0200 |
commit | d71ab9b6f0efc1ec27cc4dcafdad1f3119a2566a (patch) | |
tree | 997479d14469cda15f0ae5b20c9011eb3a71e6b6 /Makefile.example | |
parent | 95a7082eb3284818d6e0711c07b433a28c31dca7 (diff) | |
parent | 7446f5449fe9638c9e4ee97cdeed9dbb748d2b14 (diff) | |
download | Ishtar-d71ab9b6f0efc1ec27cc4dcafdad1f3119a2566a.tar.bz2 Ishtar-d71ab9b6f0efc1ec27cc4dcafdad1f3119a2566a.zip |
Merge branch 'develop' into develop-bootstrap
Diffstat (limited to 'Makefile.example')
-rw-r--r-- | Makefile.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.example b/Makefile.example index 8c79c209f..c3b40b6df 100644 --- a/Makefile.example +++ b/Makefile.example @@ -51,10 +51,10 @@ coverage: clean archaeological_context_records,archaeological_files,archaeological_finds,archaeological_warehouse,\ archaeological_files_pdl" ./manage.py test $(apps) && coverage report -build_gitlab: +build_gitlab: clean collectstatic cd $(project); $(PYTHON) ./manage.py migrate -test_gitlab: clean +test_gitlab: build_gitlab cd $(project); $(PYTHON) manage.py test $(apps) pep8: |