diff --git a/gitlab-ci/build.yml b/gitlab-ci/build.yml index c8df615..b4ca3c9 100644 --- a/gitlab-ci/build.yml +++ b/gitlab-ci/build.yml @@ -1,6 +1,6 @@ static: stage: build - image: node:12 + image: node:12-bullseye before_script: - npm install script: diff --git a/gitlab-ci/lint.yml b/gitlab-ci/lint.yml index 0300c33..b61a6ed 100644 --- a/gitlab-ci/lint.yml +++ b/gitlab-ci/lint.yml @@ -1,15 +1,12 @@ python-linting: stage: lint - image: python:3.7 + image: python:3.9-bullseye before_script: - - pip install poetry --quiet - - poetry config cache-dir ~/.cache/poetry - - poetry config virtualenvs.in-project true - - poetry install --no-interaction --quiet + - pip install -r requirements/production.txt -r requirements/development.txt script: - - poetry run isort src/ --check-only --recursive - - poetry run black src/ --line-length 88 --check - - poetry run autoflake src/ --check --recursive --remove-all-unused-imports --ignore-init-module-imports + - isort src/ --check-only --recursive + - black src/ --line-length 88 --check + - autoflake src/ --check --recursive --remove-all-unused-imports --ignore-init-module-imports only: refs: - development @@ -17,7 +14,7 @@ python-linting: javascript-linting: stage: lint - image: node:12 + image: node:12-bullseye before_script: - npm install script: diff --git a/gitlab-ci/test.yml b/gitlab-ci/test.yml index 163d97b..2c6cd4e 100644 --- a/gitlab-ci/test.yml +++ b/gitlab-ci/test.yml @@ -4,20 +4,16 @@ python-tests: services: - postgres:11 - memcached:1.5.22 - image: python:3.7 + image: python:3.9-bullseye before_script: - - pip install poetry --quiet - - poetry --version - - poetry config cache-dir .cache/poetry - - poetry config virtualenvs.in-project true - - poetry install --no-interaction --extras sentry + - pip install -r requirements/production.txt -r requirements/development.txt script: - - poetry run coverage run src/manage.py test newsreader - - poetry run coverage report + - ./src/manage.py test newsreader + - coverage report javascript-tests: stage: test - image: node:12 + image: node:12-bullseye before_script: - npm install script: