From a1906a376f84734ca7ec38f32b546764a562f95c Mon Sep 17 00:00:00 2001
From: nguyed99 <nguyed99@zedat.fu-berlin.de>
Date: Fri, 19 Jan 2024 23:07:40 +0100
Subject: [PATCH] Update pipeline
---
.gitlab-ci.yml | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6833500..15dd7c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,17 +21,12 @@ build-env:
- cd build/
- poetry config virtualenvs.in-project true
- poetry install --no-root
- - ls $POETRY_CACHE_DIR/cache
- - ls $POETRY_CACHE_DIR/virtualenvs
-
format:
stage: format
script:
- - ls $POETRY_CACHE_DIR/cache
- - ls $POETRY_CACHE_DIR/virtualenvs
- - export VIRTUALENV_NAME=$(ls $PIP_CACHE_DIR/virtualenvs)
- - source $CI_PROJECT_DIR/build/.venv/$VIRTUALENV_NAME/bin/activate
+ - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs)
+ - source $POETRY_CACHE_DIR/virtualenvs/$VIRTUALENV_NAME/bin/activate
- poetry run pre-commit install
- poetry run yapf -i -r -p .
- poetry run ruff .
@@ -40,15 +35,15 @@ format:
test-jobs:
stage: test-jobs
script:
- - export VIRTUALENV_NAME=$(ls $CI_PROJECT_DIR/build/.venv)
- - source $CI_PROJECT_DIR/build/.venv/$VIRTUALENV_NAME/bin/activate
+ - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs)
+ - source $POETRY_CACHE_DIR/virtualenvs/$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 $CI_PROJECT_DIR/build/.venv)
- - source $CI_PROJECT_DIR/build/.venv/$VIRTUALENV_NAME/bin/activate
+ - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs)
+ - source $POETRY_CACHE_DIR/virtualenvs/$VIRTUALENV_NAME/bin/activate
- export PYTHONPATH="$PYTHONPATH:$CI_PROJECT_DIR/tasks/src"
- poetry run pytest tasks/tests/
\ No newline at end of file
--
GitLab