From 0a1626f2827b2d232cca3b5e15b5c90c9f8be6d7 Mon Sep 17 00:00:00 2001 From: Petr Jasek Date: Thu, 2 Jan 2025 12:05:50 +0100 Subject: [PATCH] reuse github actions --- .github/workflows/tests.yml | 85 +++++++------------------------------ server/dev-requirements.txt | 15 +++---- 2 files changed, 23 insertions(+), 77 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d291914c..e026550c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,77 +1,24 @@ name: "CI" -on: - [push, pull_request] +on: [push, pull_request] jobs: server: - - runs-on: ubuntu-22.04 - - services: - redis: - image: redis:alpine - ports: - - "6379:6379" - - mongo: - image: mongo:3.6 - ports: - - "27017:27017" - - elastic: - image: elasticsearch:7.17.23 - ports: - - "9200:9200" - env: - discovery.type: single-node - - defaults: - run: - working-directory: server - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - - run: | - sudo apt-get update - sudo apt-get -y install libxml2-dev libxmlsec1-dev libxmlsec1-openssl libexempi-dev - - - run: | - python -m pip install --upgrade pip wheel setuptools - pip install -r dev-requirements.txt - - - run: flake8 - - - run: mypy . - - - run: black --check . - - - run: pytest tests - - - run: python manage.py app:initialize_data - + strategy: + matrix: + python-version: ['3.10'] + uses: superdesk/superdesk/.github/workflows/server.yml@develop + with: + python-version: ${{ matrix.python-version }} + + pytest: + strategy: + matrix: + python-version: ['3.10'] + uses: superdesk/superdesk/.github/workflows/pytest.yml@develop + with: + python-version: ${{ matrix.python-version }} client: - - runs-on: ubuntu-22.04 - - defaults: - run: - working-directory: client - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-node@v4 - with: - node-version: '14.x' - - - run: npm ci --verbose - - - run: npm run build + uses: superdesk/superdesk/.github/workflows/client.yml@develop diff --git a/server/dev-requirements.txt b/server/dev-requirements.txt index d8265eee..7129340d 100644 --- a/server/dev-requirements.txt +++ b/server/dev-requirements.txt @@ -1,16 +1,15 @@ -r requirements.txt -pep8 -pytest -flake8 -nose -mypy<=1.14.1 +pep8==1.7.1 +pytest==8.3.4 +flake8==7.1.1 +mypy==1.14.1 httmock==1.4.0 wooper==0.4.4 -requests_mock -black~=24.0 +requests_mock==1.12.1 +black==24.10.0 types-python-dateutil types-pytz -types-requests<2.32.0.20241017 # https://github.com/python/typeshed/issues/10825 +types-requests types-six