From e21aa77153ce56b48e14eac175d93b8b42bf6699 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 5 Apr 2021 20:55:53 +0200
Subject: [PATCH] Update tox.ini
---
.gitlab-ci.yml | 14 ++++++++++++--
tox.ini | 7 +++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1224312..a3308a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,16 @@ include:
- project: "AlekSIS/official/AlekSIS"
file: /ci/general.yml
- project: "AlekSIS/official/AlekSIS"
- file: /ci/test.yml
+ file: /ci/test/lint.yml
- project: "AlekSIS/official/AlekSIS"
- file: /ci/build_dist.yml
+ file: /ci/test/security.yml
+ - project: "AlekSIS/official/AlekSIS"
+ file: /ci/build/dist.yml
+ - project: "AlekSIS/official/AlekSIS"
+ file: "/ci/deploy/trigger_dist.yml"
+ - project: "AlekSIS/official/AlekSIS"
+ file: "/ci/docker/image.yml"
+ - project: "AlekSIS/official/AlekSIS"
+ file: /ci/publish/pypi.yml
+ - project: "AlekSIS/official/AlekSIS"
+ file: /ci/deploy/review.yml
diff --git a/tox.ini b/tox.ini
index 98fce3a..f09d243 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,9 +9,11 @@ whitelist_externals = poetry
skip_install = true
envdir = {toxworkdir}/globalenv
commands_pre =
- - poetry install
+ poetry install
+ poetry run aleksis-admin yarn install
+ poetry run aleksis-admin collectstatic --no-input
commands =
- - poetry run pytest --cov=. {posargs} aleksis/
+ poetry run pytest --cov=. {posargs} aleksis/
[testenv:selenium]
setenv =
@@ -33,6 +35,7 @@ commands =
[testenv:build]
commands_pre =
+ poetry run sh -c "cd aleksis; aleksis-admin compilemessages"
commands = poetry build
[testenv:docs]
--
GitLab