diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3a748c..41fb6b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ stages: variables: UV_CACHE_DIR: "$CI_PROJECT_DIR/.cache/uv" + PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" DJANGO_SETTINGS_MODULE: "newsreader.conf.gitlab" POSTGRES_HOST: "$POSTGRES_HOST" POSTGRES_DB: "$POSTGRES_NAME" @@ -16,7 +17,7 @@ variables: cache: key: "$CI_COMMIT_REF_SLUG" paths: - - env/ + - .cache/pip - .cache/uv - node_modules/ diff --git a/gitlab-ci/lint.yml b/gitlab-ci/lint.yml index 6a68a12..47a055d 100644 --- a/gitlab-ci/lint.yml +++ b/gitlab-ci/lint.yml @@ -2,7 +2,8 @@ python-linting: stage: lint image: python:3.11 before_script: - - uv pip install --requirement requirements/ci.txt + - pip install --system uv + - uv pip install --system --requirement requirements/ci.txt script: - isort --check-only src/ - black --line-length 88 --check src/ diff --git a/gitlab-ci/test.yml b/gitlab-ci/test.yml index 988cd5a..e248a12 100644 --- a/gitlab-ci/test.yml +++ b/gitlab-ci/test.yml @@ -6,7 +6,8 @@ python-tests: - memcached:1.5.22 image: python:3.11 before_script: - - uv pip install --requirement requirements/ci.txt + - pip install --system uv + - uv pip install --system --requirement requirements/ci.txt script: - coverage run ./src/manage.py test newsreader