From 67a879f7c918b8b3dc1619f147670f28ed5ce131 Mon Sep 17 00:00:00 2001
From: nguyed99 <nguyed99@zedat.fu-berlin.de>
Date: Fri, 19 Jan 2024 22:37:03 +0100
Subject: [PATCH] Update pipeline

---
 .gitlab-ci.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b30dad0..4cc8dfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: python:3.11-bullseye
 
 stages:
   - build
+  - format
   - test-jobs
   - test-tasks
 
@@ -23,12 +24,11 @@ build-env:
     paths:
       - $POETRY_CACHE_DIR/virtualenvs/
 
-before_script:
-  - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs/)
-  - source $POETRY_CACHE_DIR/$VIRTUALENV_NAME/bin/activate
-
 format:
+  stage: format
   script:
+    - export VIRTUALENV_NAME=$(ls $POETRY_CACHE_DIR/virtualenvs/)
+    - source $POETRY_CACHE_DIR/$VIRTUALENV_NAME/bin/activate
     - poetry run pre-commit install
     - poetry run yapf -i -r -p .
     - poetry run ruff .
@@ -37,12 +37,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 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 PYTHONPATH="$PYTHONPATH:$CI_PROJECT_DIR/tasks/src"
-
     - poetry run pytest tasks/tests/
\ No newline at end of file
-- 
GitLab