diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | Makefile.example | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b33ea4728..73cc2062e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ before_script: - apt-get update - - apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz + - apt-get install -q -y git sed python3-pip libpq-dev python3-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev python3-cairocffi tidy libtidy-dev binutils libproj-dev gdal-bin libpangocairo-1.0-0 pandoc graphviz python3-argon2 file - apt-get install -q -y locales - echo "fr_FR.UTF-8 UTF-8" >> /etc/locale.gen - dpkg-reconfigure --frontend=noninteractive locales && update-locale LANG=$LANG diff --git a/Makefile.example b/Makefile.example index e930313e1..e6de15177 100644 --- a/Makefile.example +++ b/Makefile.example @@ -106,8 +106,7 @@ soft_test_ui: clean ## launch soft tests for UI build_gitlab: clean collectstatic ## specific build for gitlab cd $(project); $(PYTHON) ./manage.py migrate -test_gitlab: build_gitlab ## - cd $(project); $(PYTHON) manage.py test --tag gis --exclude-tag ui --exclude-tag libreoffice $(apps) +test_gitlab: clean ## specific test for gitlab cd $(project); $(PYTHON) manage.py test --exclude-tag gis --exclude-tag ui --exclude-tag libreoffice $(apps) soft_test_gitlab: build_gitlab |