Skip to content

Commit

Permalink
ci: Revert - Enable merge queue checks. Run only changed tests. (#3173)
Browse files Browse the repository at this point in the history
  • Loading branch information
novakzaballa authored Dec 15, 2023
1 parent 0347fca commit fc3bce0
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 49 deletions.
28 changes: 3 additions & 25 deletions .github/workflows/api-pull-request.yml
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 @@ -69,31 +67,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: "${{ github.event_name == 'pull_request' && '.env-ci-testmon' || '.env-ci' }}"
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ checkstyle.txt
.env*
!.env-local
!.env-ci
!.env-ci-testmon
.direnv
.envrc
.tool-versions
Expand Down
3 changes: 0 additions & 3 deletions api/.env-ci-testmon

This file was deleted.

5 changes: 1 addition & 4 deletions api/.gitignore
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
15 changes: 0 additions & 15 deletions api/poetry.lock

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
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ requests-mock = "^1.11.0"
django-extensions = "^3.2.3"
pdbpp = "^0.10.3"
django-capture-on-commit-callbacks = "^1.11.0"
pytest-testmon = "^2.0.13"
mypy-boto3-dynamodb = "^1.33.0"

[build-system]
Expand Down

3 comments on commit fc3bce0

@vercel
Copy link

@vercel vercel bot commented on fc3bce0 Dec 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on fc3bce0 Dec 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vercel
Copy link

@vercel vercel bot commented on fc3bce0 Dec 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

docs – ./docs

docs-git-main-flagsmith.vercel.app
docs.bullet-train.io
docs.flagsmith.com
docs-flagsmith.vercel.app

Please sign in to comment.