From 51110d83af7c3098ded7e1eb0988e1c39a227a9c Mon Sep 17 00:00:00 2001
From: nguyed99 <nguyed99@zedat.fu-berlin.de>
Date: Fri, 19 Jan 2024 22:48:05 +0100
Subject: [PATCH] Update pipeline
---
.gitlab-ci.yml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e6047d0..62e4060 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,12 @@ stages:
- test-jobs
- test-tasks
-variables:
- POETRY_CACHE_DIR: "$CI_PROJECT_DIR/.cache/poetry"
+before_script:
+ - poetry config virtualenvs.in-project true
cache:
paths:
- - .cache/poetry
+ - .venv
build-env:
stage: build
@@ -24,8 +24,8 @@ build-env:
format:
stage: format
script:
- - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs/)
- - source $POETRY_CACHE_DIR/$VIRTUALENV_NAME/bin/activate
+ - export VIRTUALENV_NAME=$(ls .venv)
+ - source .venv/$VIRTUALENV_NAME/bin/activate
- poetry run pre-commit install
- poetry run yapf -i -r -p .
- poetry run ruff .
@@ -34,15 +34,15 @@ format:
test-jobs:
stage: test-jobs
script:
- - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs/)
- - source $POETRY_CACHE_DIR/$VIRTUALENV_NAME/bin/activate
+ - export VIRTUALENV_NAME=$(ls .venv)
+ - source .venv/$VIRTUALENV_NAME/bin/activate
- export PYTHONPATH="$PYTHONPATH:$CI_PROJECT_DIR/jobs/src"
- poetry run pytest jobs/tests/
test-tasks:
stage: test-tasks
script:
- - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs/)
- - source $POETRY_CACHE_DIR/$VIRTUALENV_NAME/bin/activate
+ - export VIRTUALENV_NAME=$(ls .venv)
+ - source .venv/$VIRTUALENV_NAME/bin/activate
- export PYTHONPATH="$PYTHONPATH:$CI_PROJECT_DIR/tasks/src"
- poetry run pytest tasks/tests/
\ No newline at end of file
--
GitLab