Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Revert "ci: Run only API tests affected by changes in PRs and Upgrade GHA runners" #2910

Merged
merged 1 commit into from
Oct 31, 2023
Merged

fix: Revert "ci: Run only API tests affected by changes in PRs and Upgrade GHA runners" #2910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions .github/workflows/api-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ on:
- .github/**
branches:
- main
merge_group:
types: [checks_requested]

defaults:
run:
working-directory: api

jobs:
test:
runs-on: General-Purpose-8c-Runner
runs-on: ubuntu-latest
name: API Unit Tests

services:
Expand All @@ -35,7 +33,7 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

strategy:
max-parallel: 2
max-parallel: 4
matrix:
python-version: ['3.10', '3.11']

Expand Down Expand Up @@ -68,31 +66,11 @@ jobs:
opts: --no-input --dry-run --check
run: make django-make-migrations

- name: Restore cached testmon data
if: ${{ github.event_name == 'pull_request' }}
id: cache-testmon-restore
uses: actions/cache/restore@v3
with:
enableCrossOsArchive: true
path: |
/home/runner/work/flagsmith/flagsmith/api/.testmondata*
key: testmon-data-python${{ matrix.python-version }}-${{ github.event.pull_request.base.sha }}
restore-keys: testmon-data-python${{ matrix.python-version }}-

- name: Run Tests
env:
DOTENV_OVERRIDE_FILE: .env-ci
run: make test

- name: Save testmon data cache
id: cache-testmon-save
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
uses: actions/cache/save@v3
with:
path: |
/home/runner/work/flagsmith/flagsmith/api/.testmondata*
key: testmon-data-python${{ matrix.python-version }}-${{github.sha}}

- name: Upload Coverage
uses: codecov/codecov-action@v3
env:
Expand Down
2 changes: 1 addition & 1 deletion api/.env-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
ANALYTICS_DATABASE_URL=postgres://postgres:postgres@localhost:5432/analytics
PYTEST_ADDOPTS=--cov . --cov-report xml -n auto --dist worksteal --testmon
PYTEST_ADDOPTS=--cov . --cov-report xml -n auto --dist worksteal
5 changes: 1 addition & 4 deletions api/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ saml/
features/workflows/logic/

# Unit test coverage
.coverage

# pytest-testmon files
.testmondata*
.coverage
33 changes: 14 additions & 19 deletions api/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion api/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ pip-tools = "~6.13.0"
pytest-cov = "~4.1.0"
datamodel-code-generator = "~0.22"
requests-mock = "^1.11.0"
pytest-testmon = "^2.0.13"

[build-system]
requires = ["poetry-core>=1.5.0"]
Expand Down