From c0b03e541e7ecfb0544c46c66cb9ffbdfcdf556b Mon Sep 17 00:00:00 2001
From: janmax <j.michal@stud.uni-goettingen.de>
Date: Mon, 18 Dec 2017 20:16:00 +0100
Subject: [PATCH] Added build dependency to coverage job
---
.gitlab-ci.yml | 3 ++-
Makefile | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 363b8695..013103f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build_test_env:
artifacts:
paths:
- .venv/
- expire_in: 1 hour
+ expire_in: 20 minutes
cache:
paths:
- .venv
@@ -76,6 +76,7 @@ test_coverage:
- coverage html -d public
dependencies:
- test_pytest
+ - build_test_env
artifacts:
paths:
- public
diff --git a/Makefile b/Makefile
index 035e3be6..222b3a5b 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,9 @@ isort-check:
migrate:
python manage.py migrate
-install:
- pip install -r requirements.txt
- pip install -r requirements.dev.txt
+install:
+ pip install -Ur requirements.txt
+ pip install -Ur requirements.dev.txt
test:
DJANGO_SETTINGS_MODULE=grady.settings pytest
--
GitLab